Merge 'refs/rewritten/junio/master' into HEAD
commit6978d61f777e516a29a2481cee372decc075c9c6
authorStepan Kasal <kasal@ucw.cz>
Thu, 15 May 2014 07:43:47 +0000 (15 09:43 +0200)
committerStepan Kasal <kasal@ucw.cz>
Thu, 15 May 2014 07:43:47 +0000 (15 09:43 +0200)
tree40ccb6e523efb2172875c8be43b940e662d6fcb6
parent94696668a7cd46bc0a9e43c0496445d227d7bf98
parentfdfcf013a9accd6236410ed70768a676cabdfca6
Merge 'refs/rewritten/junio/master' into HEAD