commit 044dbf4d76cc44bdfe4723b2e65646abf141dd40 Merge: e01dc46 e70af20 Author: Petr Pudlak <[email protected]> Date: Mon Jun 16 10:32:23 2014 +0200
Merge branch 'stable-2.12' into master
* stable-2.12
Fix merge of stable-2.11 to stable-2.12 (ssconf sync)
