Vladimír Čunát 30f31c9afc Merge 'master' into staging
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
..
2015-04-07 13:24:55 -07:00
2015-04-19 22:06:45 +02:00
2015-04-26 22:52:08 +02:00
2015-04-20 11:32:29 +02:00
2015-04-20 16:12:28 +02:00
2015-04-23 14:30:12 -04:00