commit 905dd3c4ba73d6cf4b311bd87f24a5b09519115e
Merge: cce2481 72792e0
Author: Klaus Aehlig <[email protected]>
Date: Wed Oct 8 17:20:31 2014 +0200
Merge branch 'stable-2.12' into master
* stable-2.12
Also downgrade instance-specific HV-param
Conflicts:
tools/cfgupgrade
Resolution:
take version of master
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
