[liblouis/f15: 4/4] merge with master

[Martin Gieseking]

commit acad8b3fdfee03a5d03be070c3bd972eab3047b0
Merge: cca110d 7f0804f
Author: Martin Gieseking <martin.gieseking at uos.de>
Date:   Mon Dec 12 22:27:30 2011 +0100

    merge with master

 .gitignore    |    3 +--
 liblouis.spec |    5 ++++-
 sources       |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index ae2cfb9,7ff7c94..52c111d
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,1 @@@
--/liblouis-2.2.0.tar.gz
--/liblouis-2.3.0.tar.gz
+ /liblouis-2.4.0.tar.gz