projects / astakos / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 963fde6 d01e7b2)
Merge branch 'master', remote-tracking branch 'origin' into aquarium
authorSofia Papagiannaki <papagian@gmail.com>
Tue, 28 Feb 2012 09:42:12 +0000 (11:42 +0200)
committerSofia Papagiannaki <papagian@gmail.com>
Tue, 28 Feb 2012 09:42:12 +0000 (11:42 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.