Merge 'unc' into HEAD
commitf6659890e9478d92abf5722ff44989b852485cb7
authorStepan Kasal <kasal@ucw.cz>
Wed, 16 Apr 2014 14:34:07 +0000 (16 16:34 +0200)
committerStepan Kasal <kasal@ucw.cz>
Wed, 16 Apr 2014 14:34:07 +0000 (16 16:34 +0200)
tree8519d828946e728a350ad762ef7e5ed853da7ee2
parentd16630b039c52b00d57d12a73debba2dfe5fb3e0
parent57351bf01bbf5e68539ed17595e20c1292c8f8e6
Merge 'unc' into HEAD