Merge 'refs/rewritten/junio/notyet' into HEAD
commit6ac4a73cc89e6ce02f6fda1183a5ef04fb0f033e
authorStepan Kasal <kasal@ucw.cz>
Thu, 29 May 2014 08:55:42 +0000 (29 10:55 +0200)
committerStepan Kasal <kasal@ucw.cz>
Thu, 29 May 2014 08:55:42 +0000 (29 10:55 +0200)
tree886825346ebbd8764c62f066e4e01fad3c671534
parent674dd13590f96e60e57acd0371ca8115c789ff3e
parent93671b0c6aa7071c0dc72f6e2e67f647b72c132d
Merge 'refs/rewritten/junio/notyet' into HEAD