Merge remote-tracking branch 'upstream/2.4' into 2.4
authorProf. Dr. Rudolf Haussmann <rudolf.haussmann@gmx.de>
Fri, 20 Mar 2015 00:44:29 +0000 (01:44 +0100)
committerProf. Dr. Rudolf Haussmann <rudolf.haussmann@gmx.de>
Fri, 20 Mar 2015 00:44:29 +0000 (01:44 +0100)
commit756c1a22d9b1752e0ab97a480888ced441bb7de2
treead9576376528d0ea0882af330357628c229624af
parenta7bf1d53d8a666a383bc04c57e85cdb9fe6ea730
parent69344f175b9e112f3f06dbb22550fb80124341bf
Merge remote-tracking branch 'upstream/2.4' into 2.4