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

[Adam Tkac]

commit 96b46c4ad716227372b6d65fe9c6d0665e017ec2
Merge: 8756cdd bf610a2
Author: Adam Tkac <adam.tkac at geodis.cz>
Date:   Tue Sep 3 15:59:19 2013 +0200

    Merge branch 'master' into el5
    
    Conflicts:
    	dokuwiki.spec

 dokuwiki.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---