Merge branch 'master' into debian
[snf-image] / version_template
2013-08-26 Nikos SkalkotosMake use of devflow building system