commit 28b8da6bd54e67bf308d3158ff1701982932b449
Merge: c1f3366 1ab5e9f
Author: Klaus Aehlig <aeh...@google.com>
Date: Mon Feb 16 17:25:45 2015 +0100
Merge branch 'stable-2.10' into stable-2.11
* stable-2.10
Fix haddock comment
* stable-2.11
Fix file descriptor leak in Confd Client
Fix hlint warnings found by hlint 1.9.11
Signed-off-by: Klaus Aehlig <aeh...@google.com>
--
Klaus Aehlig
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
