Merge branch 'master' into debian-precise
authorNikos Skalkotos <skalkoto@grnet.gr>
Fri, 20 Dec 2013 14:56:29 +0000 (16:56 +0200)
committerNikos Skalkotos <skalkoto@grnet.gr>
Fri, 20 Dec 2013 14:56:29 +0000 (16:56 +0200)
commit37ec71c87135f4d395557b87bdc921e5a39c5d89
tree0dd7ad0b330c7c090c496d1b4fe260a17abfaa4d
parent02105eb44cddfe2945e61bbbc014070889f2e6fa
parent2f68a8984cffd2c08e3891a398b5aca85eb248b2
Merge branch 'master' into debian-precise