Merge tag 'upstream/2.0' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Wed, 18 Apr 2012 16:07:37 +0000 (19:07 +0300)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Wed, 18 Apr 2012 16:07:37 +0000 (19:07 +0300)
commitb28c7957b6c3d8c5e5b9fa1203cc989f9d83a89e
tree45bfb4a8fe21b2e1a88939bd07e0a2a26d230963
parent22549aea27de9db27715489f44a59db142daedf0
parentb1bbcbc14fe6debc03625f698e8a904ca33d880b
Merge tag 'upstream/2.0' into experimental

Upstream version 2.0

Conflicts:
CMakeLists.txt
lang/CMakeLists.txt