Thu, 10 Sep 2015 18:22:52 +0200 merge branch ios-revival into default
sheepluva [Thu, 10 Sep 2015 18:22:52 +0200] rev 11151
merge branch ios-revival into default
(0) -10000 -3000 -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 tip