Merge branch 'master' into debian-0.8
authorNikos Skalkotos <skalkoto@grnet.gr>
Mon, 11 Mar 2013 15:04:41 +0000 (17:04 +0200)
committerNikos Skalkotos <skalkoto@grnet.gr>
Mon, 11 Mar 2013 15:04:41 +0000 (17:04 +0200)
Conflicts:
snf-image-host/version_pinning.pref


Trivial merge