projects / archipelago / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91c52b0 e722593)
Merge branch 'master' into debian debian/0.3.1
authorFilippos Giannakos <philipgian@grnet.gr>
Wed, 5 Jun 2013 16:08:11 +0000 (19:08 +0300)
committerFilippos Giannakos <philipgian@grnet.gr>
Wed, 5 Jun 2013 16:08:11 +0000 (19:08 +0300)
Conflicts:
version


Trivial merge
Archipelago