commit b48e32c8b4132323c6ea44ccfe7f82fb3ee007b6
Merge: bc7dda1 fb565c4
Author: Klaus Aehlig <[email protected]>
Date: Mon Jul 7 18:09:13 2014 +0200
Merge branch 'stable-2.10' into stable-2.11
* stable-2.10
(no changes)
* stable-2.11
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
