Merge branch 'master' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Tue, 28 Jan 2014 19:46:55 +0000 (21:46 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Tue, 28 Jan 2014 19:46:55 +0000 (21:46 +0200)
commit50b4643ab32f2cfabd58106dd892e8777bb68488
treeda12911657419c124f6dbd1267fddfcb656b9000
parent3702e47a44a703f2123d25db2ce9975ccc6787e3
parentfc715dbb3e16343f33e29ebd2780948712e63ce2
Merge branch 'master' into experimental

Conflicts:
CMakeLists.txt
debian/changelog
debian/changelog.orig