commit ca8bfb599f587d7efce3abff94651ccfca02ebb6 Merge: 28f3405 b95bc57 Author: Klaus Aehlig <[email protected]> Date: Mon Oct 20 13:07:22 2014 +0200
Merge branch 'stable-2.12' into master
* stable-2.12
The config lock still exists
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
