Merge tag 'upstream/2.1.3' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Fri, 3 May 2013 08:32:04 +0000 (11:32 +0300)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Fri, 3 May 2013 08:32:04 +0000 (11:32 +0300)
Upstream version 2.1.3

1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge