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

[Fabian Affolter]

commit daa9e4f755a29914845e072eee67de3883e5eb41
Merge: a0cce19 df2ea86
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sun Jan 6 20:43:19 2013 +0100

    Merge branch 'master' into el6

 .gitignore       |    1 +
 rednotebook.spec |    8 +++++++-
 sources          |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---