28 Jun
2012
28 Jun
'12
6:21 a.m.
Hi Michal,
On Mon, Jun 25, 2012 at 12:07 PM, Michal Čihař michal@cihar.com wrote:
Actually I was thinking about merging it, but it does not merge without conflicts. Can you please look at it?
I have merged the current master into my branch, and it should be safe now.
-- Alex