[dokuwiki/el5: 4/4] Merge branch 'master' into el5

[Adam Tkac]

commit e25bc4a97181faaa74f95da340510be95f19ae25
Merge: 96b46c4 eb2c099
Author: Adam Tkac <vonsch at gmail.com>
Date:   Thu Dec 12 17:42:47 2013 +0100

    Merge branch 'master' into el5

 .gitignore    |    1 +
 dokuwiki.spec |   14 +++++++++++---
 sources       |    2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)
---