[dokuwiki/el6: 2/2] Merge remote-tracking branch 'origin/master' into el6

[Adam Tkac]

commit 16e2b71d83376304770c80a4d7e5bc200225f48d
Merge: 68361ea d1553ce
Author: Adam Tkac <vonsch at gmail.com>
Date:   Tue Mar 3 09:56:23 2015 +0100

    Merge remote-tracking branch 'origin/master' into el6

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