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-09-06 22:54:15 +02:00
2014-08-01 15:25:50 +02:00
2014-09-02 01:48:50 +04:00