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

[Till Maas]

commit faaa6bd9d57d71c68ebff1697f850641026fc298
Merge: 35f94f8 976d48a
Author: Till Maas <opensource at till.name>
Date:   Mon Aug 16 23:48:10 2010 +0200

    Merge branch 'master' into f14

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