Merge branch 'wheezy'
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Fri, 10 May 2013 10:56:13 +0000 (13:56 +0300)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Fri, 10 May 2013 10:56:13 +0000 (13:56 +0300)
Conflicts:
debian/changelog


Trivial merge