Merge tag 'upstream/2.2.2.1'
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 23 Mar 2014 22:59:56 +0000 (00:59 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 23 Mar 2014 22:59:56 +0000 (00:59 +0200)
Upstream version 2.2.2.1

Conflicts:
CMakeLists.txt


Trivial merge