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

[Adam Tkac]

commit 8756cdd452895cfbe58987d6e7abd060a2a35a80
Merge: ac5f4c9 1611053
Author: Adam Tkac <adam.tkac at geodis.cz>
Date:   Tue Sep 3 15:31:17 2013 +0200

    Merge branch 'master' into el5

 .gitignore                     |    1 +
 dokuwiki-rm-bundled-libs.patch |62976 +---------------------------------------
 dokuwiki.spec                  |   39 +-
 fix-CVE-2012-2129.patch        |   12 -
 sources                        |    2 +-
 5 files changed, 45 insertions(+), 62985 deletions(-)
---