[rednotebook/el6: 12/12] Merge branch 'master' into el6

[Fabian Affolter]

commit a0cce19405297a7f981a93aa301db8a0bc5d421b
Merge: 8c4a544 d398b5c
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sat Dec 8 09:43:12 2012 +0100

    Merge branch 'master' into el6

 .gitignore       |    5 +++++
 rednotebook.spec |   47 +++++++++++++++++++++++++++++------------------
 sources          |    2 +-
 3 files changed, 35 insertions(+), 19 deletions(-)
---