Merge branch 'master' into debian-precise
authorNikos Skalkotos <skalkoto@grnet.gr>
Wed, 8 Jan 2014 13:59:24 +0000 (15:59 +0200)
committerNikos Skalkotos <skalkoto@grnet.gr>
Wed, 8 Jan 2014 13:59:24 +0000 (15:59 +0200)
commit59494aa2d35df8ecf6d05a7f75a4562bd6e4fbc8
treeae87b833fbe96348f300dd8a06ff45254ea6c40d
parentf599b9416e059173e7319703e8b46e17c19fdca6
parent94db968f473a997d2b29b225c08aa803910b9eab
Merge branch 'master' into debian-precise