Merge branch 'master' of dgpo:~alex/mygpo-src
commitff73074ea81910d968c2f836fe8cbcf3f5bdd968
authorStefan Koegl <stefan@skoegl.net>
Thu, 7 Jan 2010 18:29:59 +0000 (7 19:29 +0100)
committerStefan Koegl <stefan@skoegl.net>
Thu, 7 Jan 2010 18:29:59 +0000 (7 19:29 +0100)
treeaca62b284a37f0db2daaa00285b8f4c40dc4a060
parent6a09890971df63eff18ded70b08e947c7eced7eb
parent9eec849a837dc590bfaf2dbba233e773bc1faf5a
Merge branch 'master' of dgpo:~alex/mygpo-src