Merge branch 'experimental'
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Fri, 10 May 2013 11:28:44 +0000 (14:28 +0300)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Fri, 10 May 2013 11:28:44 +0000 (14:28 +0300)
commit747572166565101c5425c1dd9c3def6afc23c91c
treeac95d204556e10a0996ed4bffb7e499fad346f0d
parent28311d42d8c1198c786137020efe179b5b5c7084
parent44cbf269e7c76c9226e018a3dedb8368410a1955
Merge branch 'experimental'

Conflicts:
debian/changelog
debian/control
debian/copyright
debian/changelog