commit 8ab1a6c479abc72c2711972678f13660ac9608ac
Merge: 4b5a975 c2bc29c
Author: Klaus Aehlig <[email protected]>
Date: Thu Jul 23 19:22:39 2015 +0200
Merge branch 'stable-2.10' into stable-2.11
* stable-2.10
Fix typo in secondary
When hinting to do gnt-instance info, show the instance
Update gnt-network example in admin page
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
