commit c82797d679d98b9926f60801e7b128b1469db725
Merge: ed2787f 4b5a975
Author: Klaus Aehlig <[email protected]>
Date: Wed Jul 8 17:36:24 2015 +0200
Merge branch 'stable-2.11' into stable-2.12
* stable-2.11
Fix capitalization of TestCase
Trigger renew-crypto on downgrade to 2.11
Conflicts:
tools/post-upgrade: use 2.12 condition on when to run the hook
--
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
