Merge tag 'upstream/2.1.2+svn722' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 21 Apr 2013 15:56:10 +0000 (18:56 +0300)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 21 Apr 2013 15:56:10 +0000 (18:56 +0300)
commit118642a667ffd68dbc5d9a72a9b0c661bcbd9d5f
treeed1106a9461345a5def6678553953a7ab136bea2
parentea62c8c679e1617ae1ff1600e910ed66e8ced68d
parent59b4eec7fd5c7b75915287ffd7a59a931bd16cd8
Merge tag 'upstream/2.1.2+svn722' into experimental

Upstream version 2.1.2+svn722

Conflicts:
CMakeLists.txt
CMakeLists.txt.orig