commit 9dd7f9749333455ad19fedd782f519c5a31c7582
Merge: eba0fdb d45c5c8
Author: Klaus Aehlig <[email protected]>
Date: Fri Jun 27 12:53:03 2014 +0200
Merge branch 'stable-2.11' into stable-2.12
* stable-2.11
(no changes)
* stable-2.10
Make network_vlan an optional OpParam
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
