Merge branch 'master' of dgpo:~martin/mygpo-src
commit3433d4ebf6a0464ba5da69b1598b29d9df221346
authorStefan Koegl <stefan@skoegl.net>
Mon, 4 Jan 2010 15:46:39 +0000 (4 16:46 +0100)
committerStefan Koegl <stefan@skoegl.net>
Mon, 4 Jan 2010 15:46:39 +0000 (4 16:46 +0100)
tree0ca677ea4e485a2ac1cbc2c7ac5bdad82bab618c
parent38604e1a6bed99feed31a16735a479da6c06ae4c
parentb5bd24c73438cdec24a29d09c98d19b01055f98e
Merge branch 'master' of dgpo:~martin/mygpo-src