Merge 'refs/rewritten/junio/notyet' into HEAD
commitda26b614dcb988999923d2f7e7f40a6e81ce7d7d
authorStepan Kasal <kasal@ucw.cz>
Thu, 15 May 2014 07:43:51 +0000 (15 09:43 +0200)
committerStepan Kasal <kasal@ucw.cz>
Thu, 15 May 2014 07:43:51 +0000 (15 09:43 +0200)
treed76c727b8737ed7c75ebbcbd6e6dcc5c066317a2
parent9fc185502f2ac24562159a2d05b662b47f5309e8
parent2a245b1d994606ba2434b41a30d921e8a77d3fc5
Merge 'refs/rewritten/junio/notyet' into HEAD