Merge tag 'upstream/2.3'
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 10 Aug 2014 20:23:26 +0000 (23:23 +0300)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 10 Aug 2014 20:23:26 +0000 (23:23 +0300)
Upstream version 2.3

Conflicts:
CMakeLists.txt


Trivial merge