Emilien Macchi 754c8a1b67 Merge branch 'master' into bug/136/emilien
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>

Conflicts:
	spec/classes/cloud_image_spec.rb
2014-02-03 09:51:55 +01:00
..
2013-12-28 12:14:48 +01:00
2013-12-28 11:24:06 +01:00