Merge branch 'stable-2.11' into stable-2.12

['Klaus Aehlig' via ganeti-devel]

commit 98852803f647b12a633ed180b40e78f485b32be3
Merge: 54bc4fe a16abe1
Author: Klaus Aehlig <aeh...@google.com>
Date:   Tue Feb 17 14:13:47 2015 +0100

    Merge branch 'stable-2.11' into stable-2.12
    
    * stable-2.11
      (no changes)
    
    * stable-2.10
      Fix haddock comment
    
    * stable-2.9
      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