Merge remote-tracking branch 'glisignoli/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 18 Feb 2013 17:47:35 +0000 (18:47 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 18 Feb 2013 17:47:35 +0000 (18:47 +0100)
commit79eb0287ab34767e72e77d612775789ff9da0422
tree78c92c62951aca26edbb3ac11ec4c098cc6a7270
parent58994225bcd6626c2ed2bbf441577b0beaa4bf3c
parent355fc8e9443b991819b5ebf95464894bd131126c
Merge remote-tracking branch 'glisignoli/master'