diff options
| author | intrigeri <intrigeri@boum.org> | 2008-12-30 18:24:36 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2008-12-30 18:24:36 +0100 |
| commit | 21add7ffa87a5e622d18bdbb24c638c15bdb3800 (patch) | |
| tree | 6780aa6dbee71f18db64e44b012e789fc8197d4b /doc/sandbox/castle/discussion | |
| parent | 3190e5cea75a43d38f58b8a45fbc87d5527d18f0 (diff) | |
| parent | 3032909090711c86c5056987043eeff5a1f6aec2 (diff) | |
Merge commit 'upstream/master' into prv/po
Conflicts:
debian/control
debian/copyright
doc/ikiwiki/pagespec.mdwn
Signed-off-by: intrigeri <intrigeri@boum.org>
Diffstat (limited to 'doc/sandbox/castle/discussion')
| -rw-r--r-- | doc/sandbox/castle/discussion/jon_tests_too.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/sandbox/castle/discussion/jon_tests_too.mdwn b/doc/sandbox/castle/discussion/jon_tests_too.mdwn index 864f38c0d..bc051b008 100644 --- a/doc/sandbox/castle/discussion/jon_tests_too.mdwn +++ b/doc/sandbox/castle/discussion/jon_tests_too.mdwn @@ -1,3 +1,3 @@ -I recall testing this too, but I'm not sure where the test went. Let's try again. -- [[JonDowland]] +I recall testing this too, but I'm not sure where the test went. Let's try again. -- [[users/Jon]] Context: [[todo/discussion_page_as_blog/discussion/castle]] |