Merge 'unc' into HEAD
commit926a92b51cf1dc89c4eb28e9056a2341e3585b31
authorStepan Kasal <kasal@ucw.cz>
Thu, 15 May 2014 07:43:56 +0000 (15 09:43 +0200)
committerStepan Kasal <kasal@ucw.cz>
Thu, 15 May 2014 07:43:56 +0000 (15 09:43 +0200)
treeced75d456133ad68463e6ddf5c715ef70215a297
parenta5be7ee70d92aafb537171756169776c25257ab7
parentbcdefd4c635396f7cf22f7230ff73db1235d742e
Merge 'unc' into HEAD