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-08-25 14:40:40 +02:00
2014-10-23 17:40:41 +02:00
2014-04-19 14:41:21 +02:00