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/roadmap.mdwn | |
| 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/roadmap.mdwn')
| -rw-r--r-- | doc/roadmap.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn index 488e2dec8..9ed5742eb 100644 --- a/doc/roadmap.mdwn +++ b/doc/roadmap.mdwn @@ -52,7 +52,7 @@ Version 3.0 will be an opportunity to make significant transitions. It will include a vast number of new features, bugfixes, and other improvements, far too many to list here. -Release is planned for fall, 2008. +Release is planned for fall^Wlate, 2008. ---- |