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)
commitd92f34aa02b61e20adc9fd8d0f7fca725015fd60
tree9f46daa71e966533765cacc19cc1be0801f87818
parent44cbf269e7c76c9226e018a3dedb8368410a1955
parent7c3aa541b1bafc81cbba22e76040cf5c4e8b34c1
Merge tag 'upstream/2.2.1' into experimental

Upstream version 2.2.1

Conflicts:
CMakeLists.txt