Merge remote-tracking branch 'pishposhmcgee/patch-2'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 25 Jul 2013 07:34:56 +0000 (09:34 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 25 Jul 2013 07:34:56 +0000 (09:34 +0200)
commit09eeb75130bf703cd5a84f99634b86589ec7159e
treecfd92d63e0873ece8443592c93f85f1a7ec7edc4
parent0a99956f711d492c6ca08cd086d3d4b5024fd10f
parent12ef6aefa8ef5b8959a1b51788dd42cc33a4fe5c
Merge remote-tracking branch 'pishposhmcgee/patch-2'