Luca Bruno 83221f3886 Merge branch 'master' into staging ... Makes the build more useful: - Disabled hybrid iso, makes installer tests pass again - Imagemagick fixes to the "Illegal instruction" thing		2014-11-08 15:56:40 +01:00
..
darwin	fixes #1933	2014-10-23 00:14:09 +02:00
gnu
linux	Merge branch 'master' into staging	2014-11-08 15:56:40 +01:00
windows