Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sun, 5 Apr 2015 18:30:38 +0000 (20:30 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 5 Apr 2015 18:30:38 +0000 (20:30 +0200)
commit8bdb026745a442ef8aa4ba9ee44d0be30f8b80d4
tree2f5bf76d33200081e888bcb91912ae40392a44a4
parent5c0b550f38dba890f9d79b5356661bf1bf2f82b6
parentbf28cc0f754e22cf8c52d017665e32de69208a45
Merge remote-tracking branch 'upstream/master'