Merge branch 'master' of git://github.com/Mic92/mygpo
commitcf9a1d0cc3034537e7198268c3e8377b5b30adc2
authorStefan Kögl <stefan@skoegl.net>
Wed, 29 Aug 2012 11:36:40 +0000 (29 13:36 +0200)
committerStefan Kögl <stefan@skoegl.net>
Wed, 29 Aug 2012 11:36:40 +0000 (29 13:36 +0200)
treeb4093b92b726ad96ce745f2da269e3780ab723b2
parent42bcc04b06cf3edaef5ce979ecb2408a9668732e
parenta20c66928d75280d7322e19d85c5b23e670f339d
Merge branch 'master' of git://github.com/Mic92/mygpo