commit a3d8f6353f8658bd5fb6a799716d7f1fd44906c3
Merge: b8be157 5c528a0
Author: Klaus Aehlig <[email protected]>
Date: Wed Nov 11 16:51:42 2015 +0100
Merge branch 'stable-2.10' into stable-2.11
* stable-2.10
Remove -X from hspace man page
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: Matthew Scott Sucherman, Paul Terence Manicle
