Merge branch 'master' of dgpo:mygpo-src
commitac1af25bc8c38f1d464126280cb57b98e0ae1878
authorStefan Koegl <stefan@skoegl.net>
Thu, 26 Nov 2009 19:19:53 +0000 (26 20:19 +0100)
committerStefan Koegl <stefan@skoegl.net>
Thu, 26 Nov 2009 19:19:53 +0000 (26 20:19 +0100)
tree329e4da22eb31b36f4e6abb4d778752452a99f9f
parent1e3811b7fdf248ba7bb4436de1f2f0019285790b
parent4df2d722249debccd00fc319db68799c3c1d5339
Merge branch 'master' of dgpo:mygpo-src