Merge branch 'master' into debian-precise
authorNikos Skalkotos <skalkoto@grnet.gr>
Fri, 17 Jan 2014 09:14:22 +0000 (11:14 +0200)
committerNikos Skalkotos <skalkoto@grnet.gr>
Fri, 17 Jan 2014 09:14:22 +0000 (11:14 +0200)
commit383f15b12df96e0a0ee819bad3642fad9b3d4846
tree51c8d6aaa84ae98ce586b82141cf663d56e5caa1
parent21d11da09463b900d696ad5a4c867a2a92378ebc
parent80225941c13a67e137f8a42d2c111abc4d808a6d
Merge branch 'master' into debian-precise