Merge remote-tracking branch 'Oteng/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 5 Jan 2015 17:18:15 +0000 (18:18 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 5 Jan 2015 17:18:15 +0000 (18:18 +0100)
commit18c3c15391de27d4dd6e550087ca244d294a9bf2
treeb01e0e5cb9bcab0d019daf4a4f51656098c9a7ca
parentdda620e88c68e995afcc3cd35b9d360cb42527a0
parent03ff2cc1c49c82daf2218b76e169c2d679447f03
Merge remote-tracking branch 'Oteng/master'