Merge branch 'master' of dgpo:~martin/mygpo-src
commit1219003b3ec53d4e058ae17c2d4ee7da335117c2
authorStefan Koegl <stefan@skoegl.net>
Sun, 13 Dec 2009 17:56:14 +0000 (13 18:56 +0100)
committerStefan Koegl <stefan@skoegl.net>
Sun, 13 Dec 2009 17:56:14 +0000 (13 18:56 +0100)
treea0592c1288a9f24352427ff629a1f0316bffcf8b
parentb5352599cc0fbc25d564ae18533c845547a363c6
parent629e49a8635f9830db6487e662d0e40745d65af7
Merge branch 'master' of dgpo:~martin/mygpo-src