Merge branch 'debian-feature-new-configfile-rebased' into debian-develop
authorFilippos Giannakos <philipgian@grnet.gr>
Tue, 28 Jan 2014 15:11:31 +0000 (17:11 +0200)
committerFilippos Giannakos <philipgian@grnet.gr>
Tue, 28 Jan 2014 15:11:31 +0000 (17:11 +0200)
commit132ebdd6c7639f4f73f183e99701145ffbd211c1
treef0648b45bdf02bab1f8e84a122a2613fe4edfeff
parent803fb2c6087cbdd9f3985278e2095e628374f7f6
parent686376982350a96fa7d91db1c4e15ca29337ecd2
Merge branch 'debian-feature-new-configfile-rebased' into debian-develop