Merge tag 'upstream/2.2.1+svn921'
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 23 Feb 2014 16:53:03 +0000 (18:53 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 23 Feb 2014 16:53:03 +0000 (18:53 +0200)
Upstream version 2.2.1+svn921

Conflicts:
CMakeLists.txt


Trivial merge