commit e6a749069438ea714a430042cbabee1b0ba20769
Merge: e989fae ebd41f0
Author: Klaus Aehlig <[email protected]>
Date: Tue Aug 19 18:16:03 2014 +0200
Merge branch 'stable-2.11' into stable-2.12
* stable-2.11
(no changes)
* stable-2.10
Fix network info in case of multi NIC instances
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
