Merge branch 'master' of git://repo.or.cz/mygpo
commitca41e6621b10d8ee55164f78f81fed4f481d1625
authorStefan Koegl <stefan@skoegl.net>
Wed, 9 Jun 2010 20:05:44 +0000 (9 22:05 +0200)
committerStefan Koegl <stefan@skoegl.net>
Wed, 9 Jun 2010 20:05:44 +0000 (9 22:05 +0200)
treebdf7975dd93383db769d5fbbb017516b3e0f3a9f
parentd7ee3cacff75a1322ea005d3fea800e52f7c4698
parent856cd80f2b12c2251b5e43ea1f78cffb2a1ad466
Merge branch 'master' of git://repo.or.cz/mygpo