Merge tag 'upstream/2.3.2' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sat, 7 Feb 2015 19:27:02 +0000 (21:27 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sat, 7 Feb 2015 19:27:02 +0000 (21:27 +0200)
commit1c653050b83112f45f186b07e5ad95fe104969c9
tree58d74877f378397db23c72172a6d537d4d986baa
parent3dbb406b91fc780dcdd8b5d5f590e9687adf150d
parent33a8b6c3787cda4b38f7733a5a4f3ad119a3fd34
Merge tag 'upstream/2.3.2' into experimental

Upstream version 2.3.2