summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorKate Arzamastseva <pshns@ukr.net>2011-04-18 17:00:40 +0300
committerKate Arzamastseva <pshns@ukr.net>2011-04-18 17:00:40 +0300
commitf493983cbddc6c8c387a76bf3f6631853485162b (patch)
tree38cc53f0b287fde2a1b4426faa8a6fff1e56d769 /README
parent058f1c3e98b1437a691cc77a36002dee1c41f007 (diff)
parent342e58c8c048bfd5f57f10bd88cee95aa2732e96 (diff)
downloadrpg-f493983cbddc6c8c387a76bf3f6631853485162b.tar.gz
rpg-f493983cbddc6c8c387a76bf3f6631853485162b.tar.bz2
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'README')
-rw-r--r--README2
1 files changed, 1 insertions, 1 deletions
diff --git a/README b/README
index 76a7cf6cd..6bb9a3bd9 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@ at http://www.dokuwiki.org/
For Installation Instructions see
http://www.dokuwiki.org/install
-DokuWiki - 2004-2010 (c) Andreas Gohr <andi@splitbrain.org>
+DokuWiki - 2004-2011 (c) Andreas Gohr <andi@splitbrain.org>
and the DokuWiki Community
See COPYING and file headers for license info