Merge tag 'upstream/2.2.1' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Tue, 28 Jan 2014 18:26:49 +0000 (20:26 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Tue, 28 Jan 2014 18:26:49 +0000 (20:26 +0200)
Upstream version 2.2.1

Conflicts:
CMakeLists.txt


Trivial merge