Merge remote-tracking branch 'rtime/master'
authorPavel Pisa <ppisa@pikron.com>
Sat, 27 Aug 2016 08:39:30 +0000 (10:39 +0200)
committerPavel Pisa <ppisa@pikron.com>
Sat, 27 Aug 2016 08:39:30 +0000 (10:39 +0200)
commitd372df6812f012ca8caf1fde056ec640bec0d55c
tree67236f00aaaa438ce2a34026c3e6160974a3782b
parent1a97c1a15647bd26d57cc1fdc1f3d3f8578a9383
parenta7c5ee73ad71ae8502e28c907929e2175818b998
Merge remote-tracking branch 'rtime/master'