commit ffcb9d7cb24a7fb3b0f83c9f778f1502057060ff
Merge: f1218ca 4964420
Author: Klaus Aehlig <[email protected]>
Date: Wed Jun 17 16:17:31 2015 +0200
Merge branch 'stable-2.14' into stable-2.15
* stable-2.14
Make htools tolerate missing "dtotal" and "dfree" 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
