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)
commit28311d42d8c1198c786137020efe179b5b5c7084
tree9de2ed1b220d05440bcd1fda247893c4c5a18474
parentaa2ea66a269e7b14c8ab02f52eff760ed2cb5ad5
parent68c5d44f5288d384d59d43013322c7ed2a42ec6e
Merge branch 'wheezy'

Conflicts:
debian/changelog