Merge 'refs/rewritten/junio/next' into HEAD
commit674dd13590f96e60e57acd0371ca8115c789ff3e
authorStepan Kasal <kasal@ucw.cz>
Thu, 29 May 2014 08:55:41 +0000 (29 10:55 +0200)
committerStepan Kasal <kasal@ucw.cz>
Thu, 29 May 2014 08:55:41 +0000 (29 10:55 +0200)
tree51ecc4c94c2b654a44ae491e9df0d2c40d1e8312
parentec765f62e21aa1d3f2ad565a93844758021cc68d
parent6c536a98b3b579c682ad8b6e4b016f87889948b1
Merge 'refs/rewritten/junio/next' into HEAD