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

[Fabian Affolter]

commit db772ebdae66accbd9db53f17a2276ac57d6eb12
Merge: daa9e4f 791a273
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sat Jun 8 21:23:06 2013 +0200

    Merge branch 'master' into el6

 .gitignore       |    3 +++
 rednotebook.spec |   14 +++++++++++++-
 sources          |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---