Merge tag 'upstream/2.0.3' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Tue, 11 Sep 2012 18:04:27 +0000 (21:04 +0300)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Tue, 11 Sep 2012 18:04:27 +0000 (21:04 +0300)
commite9146234931856d539cc2bfe20bc60d812784687
treeaafd61e0efe053a83ffeb8f9eed26717e143885d
parent94bdc1e606f108c9b85de57fbf5a6af4c6ab3e93
parent95944fcfeee35b1c23d8ba474890c04fa6585c22
Merge tag 'upstream/2.0.3' into experimental

Upstream version 2.0.3

Conflicts:
CMakeLists.txt
debian/patches/series