Merge branch 'master' of dgpo:~armin/mygpo-src
commitc419221c34c8e2dd315faaa848e840a615b4e2bb
authorStefan Koegl <stefan@skoegl.net>
Tue, 1 Dec 2009 15:52:24 +0000 (1 16:52 +0100)
committerStefan Koegl <stefan@skoegl.net>
Tue, 1 Dec 2009 15:52:24 +0000 (1 16:52 +0100)
tree44636f8f526c39e53a046a823075abe25b759f67
parent3b32dccfb3870085ac797fe52fcc0caf9e90567d
parentaf4546c84a2f0b729fa2d248d053253a26452034
Merge branch 'master' of dgpo:~armin/mygpo-src