Merge branch 'master' of dgpo:~armin/mygpo-src
commitc447679c93f692d751fdc09b3c7b1be49699132f
authorStefan Koegl <stefan@skoegl.net>
Mon, 4 Jan 2010 19:56:02 +0000 (4 20:56 +0100)
committerStefan Koegl <stefan@skoegl.net>
Mon, 4 Jan 2010 19:56:02 +0000 (4 20:56 +0100)
treec9ba86c7ee7be3b7a38f8c1b01cfd89efcf8b49e
parent4f500aa4e2189e98803153f48c9d534d21cf6363
parent37c73b4a6ba68aa9f2c504c4f3213e1e979220b9
Merge branch 'master' of dgpo:~armin/mygpo-src