commit a847a17913c1aec2452720e95fb757b78acad599
Merge: 67d8e52 cfa2f2c
Author: Klaus Aehlig <[email protected]>
Date: Mon Jan 12 14:13:48 2015 +0100
Merge branch 'stable-2.11' into stable-2.12
* stable-2.12
(no changes)
* stable-2.11
Fix typo in gnt_cluster output
Signed-off-by: Klaus Aehlig <[email protected]>
--
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
