Merge branch 'master' of gpn:/srv/mygpo
authorStefan Koegl <stefan@skoegl.net>
Wed, 15 Sep 2010 13:57:57 +0000 (15 16:57 +0300)
committerStefan Koegl <stefan@skoegl.net>
Wed, 15 Sep 2010 13:57:57 +0000 (15 16:57 +0300)

Trivial merge