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)
commitff13d1f83362bc6dfc589cec9f945e70a39cf685
treed0cd902b1bc827304c17cf2b3c6cbc143ddd514a
parentda5f4b815a21aeb9c00517df0382f98f95f7137f
parentaea26aab01b15b2861c184bac758df2b207b124d
Merge branch 'master' into debian-0.8

Conflicts:
snf-image-host/version_pinning.pref