Merge tag 'upstream/2.1.2' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Tue, 12 Feb 2013 17:55:58 +0000 (19:55 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Tue, 12 Feb 2013 17:55:58 +0000 (19:55 +0200)
commit71618f5b23d36b77eb35ac4a69b2a46c35e003c7
treeb7812d6d3c87176ca6fc86349ae2d372d5b4ab3d
parentb805cfd96c5b405f03f8da74b4b0a4a36f5ce9a9
parent7d95b7e3adb1fbd076d0ac2fc6ba05c75db19b40
Merge tag 'upstream/2.1.2' into experimental

Upstream version 2.1.2

Conflicts:
CMakeLists.txt