commit 4915bc9e7c59d99265068302dbea6f8ab0976e73
Merge: 9b91bd4 b61e7f2
Author: Klaus Aehlig <[email protected]>
Date: Mon Jul 7 16:21:28 2014 +0200
Merge branch 'stable-2.9' into stable-2.10
* stable-2.9
Push return out of genericResult
Make htools tolerate missing "spfree" on luxi
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
