Merge branch 'stable-2.10' into stable-2.11

['Klaus Aehlig' via ganeti-devel]

commit e4b7e4ab5c48b8500d49202b030ca1eddf1b653f
Merge: 5e641d0 f3aff42
Author: Klaus Aehlig <aeh...@google.com>
Date:   Mon Jan 12 12:36:38 2015 +0100

    Merge branch 'stable-2.10' into stable-2.11
    
    * stable-2.10
      Fix typo in gnt_cluster output
    
    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