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
..
2014-05-07 20:33:32 +02:00
2014-09-09 13:54:24 -07:00
2014-01-21 20:35:49 +01:00
2014-01-21 20:35:49 +01:00
2014-09-09 13:54:24 -07:00