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

[Adam Tkac]

commit d731c3d005880b6c1c3450e257c74875a21e8ebd
Merge: 2703617 eb2c099
Author: Adam Tkac <vonsch at gmail.com>
Date:   Thu Dec 12 17:42:08 2013 +0100

    Merge branch 'master' into el6

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