Merge branch 'master' into debian-wheezy
authorDimitris Aragiorgis <dimara@grnet.gr>
Tue, 29 Oct 2013 13:11:20 +0000 (15:11 +0200)
committerDimitris Aragiorgis <dimara@grnet.gr>
Tue, 29 Oct 2013 13:11:20 +0000 (15:11 +0200)
commit70f52b0c3fb2c0725277851e9b778a8abd561cda
tree0179fb82a41035fb4aa6aedc41293760b0b76422
parentc3e4bf8cdcde208b869539a2264fa063904f4dfa
parente25a5fcebd63c708a448295996e6da03e6125c11
Merge branch 'master' into debian-wheezy

Conflicts:
version

Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>