[libHX/f13/master: 2/2] Merge branch 'master' into f13

[Till Maas]

commit 7542c6799550ea3c526162afeb9dec7fe9edde77
Merge: ea054fb 976d48a
Author: Till Maas <opensource at till.name>
Date:   Mon Aug 16 23:48:19 2010 +0200

    Merge branch 'master' into f13

 .gitignore |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---