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

[Adam Tkac]

commit cb10cd9d79c090a865726e80c4fff536ab44fca8
Merge: b87796b 1611053
Author: Adam Tkac <adam.tkac at geodis.cz>
Date:   Tue Sep 3 15:29:29 2013 +0200

    Merge branch 'master' into el6

 .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(-)
---