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)
commit90d9fb461900459418d7480b76a9bf8878447a07
treef3af9e36195ebdd5c297ee57b6f4c3225c7b0c8d
parentbc25e85809f7f9eaec04ac5c68f38689b0e6ecf9
parentf4f4a0b9b1a47039bf0609a6e91ebbd5a18972d8
Merge tag 'upstream/2.2.2.1'

Upstream version 2.2.2.1

Conflicts:
CMakeLists.txt