commit d6c2088e81ebc1562d49d18259f6d0111bba3d63
Merge: f7ca3ca da29c7c
Author: Klaus Aehlig <[email protected]>
Date: Mon Apr 13 15:33:50 2015 +0200
Merge branch 'stable-2.13' into stable-2.14
* stable-2.13
Add missing design document to Makefile.am
* stable-2.12
Increase number of retries for daemon RPCs
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
