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

[Adam Tkac]

commit 2703617e2fbb428ae62f2706a91c32559b765abf
Merge: cb10cd9 bf610a2
Author: Adam Tkac <adam.tkac at geodis.cz>
Date:   Tue Sep 3 15:57:50 2013 +0200

    Merge branch 'master' into el6

 dokuwiki.spec |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
---