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)
commit249fc207b6c426e71a01b254846e1a23e52b616d
tree5f27ba15a20f833d983cc1346326bd2ccd17411b
parentffd8465017b77e10add1e106fb4e4b9473fa6db9
parentc59c5061299462e395132baebc6f8e96a0c82d12
Merge tag 'upstream/2.1.3' into experimental

Upstream version 2.1.3
CMakeLists.txt