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-15 02:16:04 +02:00
2014-06-28 16:05:47 +02:00
2014-10-22 08:22:58 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-11-05 15:00:44 +01:00
2014-06-28 16:05:47 +02:00
2014-10-07 21:46:15 +02:00
2014-08-10 14:51:23 +02:00
2014-09-29 13:32:55 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-04-14 21:03:43 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-11-06 14:55:44 +01:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-07-01 16:28:34 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00