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)
commit543e89e085de1eeb649f447cd11c27b3f96b2c19
tree95140e26ac3d1519d15e6f34bfb9d5724af73bac
parentc8abaece21198db6e0a5a25607e7882c13bb7dcc
parente62725c4be271e8151fe01a398660d9f06016ea1
Merge tag 'upstream/2.2.1+svn921'

Upstream version 2.2.1+svn921

Conflicts:
CMakeLists.txt