ikiwiki.git
13 years agoAdjust templates/page.tmpl for better XHTML output. obsolete/old
W. Trevor King [Thu, 14 Oct 2010 01:42:47 +0000 (21:42 -0400)]
Adjust templates/page.tmpl for better XHTML output.

13 years agoMerge branch 'master' of ssh://einstein/~/public_html/code/git/ikiwiki
W. Trevor King [Wed, 13 Oct 2010 21:27:32 +0000 (17:27 -0400)]
Merge branch 'master' of ssh://einstein/~/public_html/code/git/ikiwiki

13 years agoGive full namespace for HTML::Entities::encode_entities().
W. Trevor King [Wed, 13 Oct 2010 21:29:28 +0000 (17:29 -0400)]
Give full namespace for HTML::Entities::encode_entities().

13 years agoEncode <, >, and & as entities during raw inlines.
W. Trevor King [Wed, 13 Oct 2010 21:21:42 +0000 (17:21 -0400)]
Encode <, >, and & as entities during raw inlines.

13 years agoMerge remote branch 'origin/master'
W. Trevor King [Wed, 13 Oct 2010 21:20:34 +0000 (17:20 -0400)]
Merge remote branch 'origin/master'

13 years agoMerge remote branch 'origin/org'
W. Trevor King [Wed, 6 Oct 2010 15:01:12 +0000 (11:01 -0400)]
Merge remote branch 'origin/org'

13 years agoDecode UTF-8 when reading export results in org.pm.
W. Trevor King [Wed, 6 Oct 2010 15:03:08 +0000 (11:03 -0400)]
Decode UTF-8 when reading export results in org.pm.

13 years agoSimplify mdwn.pm Markdown::Markdown error message.
W. Trevor King [Wed, 6 Oct 2010 13:36:10 +0000 (09:36 -0400)]
Simplify mdwn.pm Markdown::Markdown error message.

Avoids:
  ../IkiWiki/Plugin/mdwn.pm:100: invalid variable interpolation at "$"

13 years agoMerge remote branch 'origin/master'
W. Trevor King [Wed, 6 Oct 2010 13:35:17 +0000 (09:35 -0400)]
Merge remote branch 'origin/master'

13 years agoClean up default org-mode export options to only export the body section.
W. Trevor King [Wed, 6 Oct 2010 13:30:46 +0000 (09:30 -0400)]
Clean up default org-mode export options to only export the body section.

13 years agoMerge remote branch 'origin/org'
W. Trevor King [Wed, 6 Oct 2010 13:30:37 +0000 (09:30 -0400)]
Merge remote branch 'origin/org'

13 years agoMerge remote branch 'origin/org'
W. Trevor King [Wed, 6 Oct 2010 11:22:53 +0000 (07:22 -0400)]
Merge remote branch 'origin/org'

13 years agoRemove mdwn.pm checkconfig() definition.
W. Trevor King [Wed, 6 Oct 2010 10:37:54 +0000 (06:37 -0400)]
Remove mdwn.pm checkconfig() definition.

1) I'd never registered it.
2) We *don't* want to configure markdown_path by default, because when
   its defined it overrides any perl modules (e.g. Text::Markdown).

13 years agoUpdate org.pm plugin for IkiWiki 3.00.
W. Trevor King [Wed, 6 Oct 2010 10:33:45 +0000 (06:33 -0400)]
Update org.pm plugin for IkiWiki 3.00.

Also replace string postprocessing with org-export-... configuration.

13 years agoAdded Manoj Srivastava's org.pm plugin.
Manoj Srivastava [Tue, 5 Oct 2010 23:26:43 +0000 (19:26 -0400)]
Added Manoj Srivastava's org.pm plugin.

From
  http://www.golden-gryphon.com/blog/manoj/blog/2008/06/08/Using_org-mode_with_Ikiwiki/
on which page it lists the license as "GPL".

13 years agoMake it easy to select a Markdown executible.
W. Trevor King [Tue, 5 Oct 2010 17:31:30 +0000 (13:31 -0400)]
Make it easy to select a Markdown executible.

For example, if you want to use a local version of Markdown to work
around bugs in your system's version.

The latest version of Gruber's Markdown seems to be:
  http://daringfireball.net/projects/downloads/Markdown_1.0.2b8.tbz
Release note:
  http://six.pairlist.net/pipermail/markdown-discuss/2007-May/000615.html
Debian experimental is using this 1.0.2b8 version:
  http://packages.debian.org/search?keywords=markdown

There are many other implementations as well, and most seem to support
the
  /path/to/markdown SOURCE
syntax, printing the marked up XHTML to stdout.  This patch makes it
easy to drop in any executable you wish.

13 years agoRevert "Remove blank line before closing raw.tmpl <article>/<div>."
W. Trevor King [Tue, 5 Oct 2010 15:21:40 +0000 (11:21 -0400)]
Revert "Remove blank line before closing raw.tmpl <article>/<div>."

This reverts commit 165d1642544f94885e495b49d8f99512e3a8c125.

The problem that commit was trying to fix was due to a Markdown bug:
  http://ikiwiki.info/bugs/RecentChanges_contains_invalid_XHTML/
  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=421845

13 years agoDocument raw.tmpl in doc/templates.mdwn.
W. Trevor King [Tue, 5 Oct 2010 14:59:25 +0000 (10:59 -0400)]
Document raw.tmpl in doc/templates.mdwn.

13 years agoMerge branch 'master' of git://git.ikiwiki.info
W. Trevor King [Tue, 5 Oct 2010 14:11:00 +0000 (10:11 -0400)]
Merge branch 'master' of git://git.ikiwiki.info

13 years agoFix wikilink from git to wtk page.
https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA [Tue, 5 Oct 2010 14:10:00 +0000 (14:10 +0000)]
Fix wikilink from git to wtk page.

13 years agoAdd gitbranch template to inline_raw_files.mdwn.
https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA [Tue, 5 Oct 2010 14:08:23 +0000 (14:08 +0000)]
Add gitbranch template to inline_raw_files.mdwn.

13 years agoUse wtk's github branch instead of drexel.edu branch.
https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA [Tue, 5 Oct 2010 14:02:03 +0000 (14:02 +0000)]
Use wtk's github branch instead of drexel.edu branch.

13 years agoAdded github git branch for W. Trevor King.
https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA [Tue, 5 Oct 2010 13:59:27 +0000 (13:59 +0000)]
Added github git branch for W. Trevor King.

13 years agoMerge remote branch 'public/master'
W. Trevor King [Tue, 5 Oct 2010 13:39:03 +0000 (09:39 -0400)]
Merge remote branch 'public/master'

13 years agoConvert my mdwn_itex comment in doc/todo/latex.mdwn to internal links.
W. Trevor King [Tue, 5 Oct 2010 13:38:19 +0000 (09:38 -0400)]
Convert my mdwn_itex comment in doc/todo/latex.mdwn to internal links.

13 years agoMerge branch 'master' of git://git.ikiwiki.info
W. Trevor King [Tue, 5 Oct 2010 13:35:58 +0000 (09:35 -0400)]
Merge branch 'master' of git://git.ikiwiki.info

13 years agoAdded link to git repository with support for inlining raw files.
https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA [Tue, 5 Oct 2010 13:33:36 +0000 (13:33 +0000)]
Added link to git repository with support for inlining raw files.

13 years agoRemove blank line before closing raw.tmpl <article>/<div>.
W. Trevor King [Tue, 5 Oct 2010 13:24:55 +0000 (09:24 -0400)]
Remove blank line before closing raw.tmpl <article>/<div>.

When generating HTML, the blank line had lead to the unbalanced code:
  <p></div></p>

13 years agoMerge branch 'master' of git://git.ikiwiki.info
W. Trevor King [Tue, 5 Oct 2010 12:39:28 +0000 (08:39 -0400)]
Merge branch 'master' of git://git.ikiwiki.info

13 years agoExtend inlining to handle raw files (files with unrecognized extensions).
W. Trevor King [Tue, 5 Oct 2010 12:34:16 +0000 (08:34 -0400)]
Extend inlining to handle raw files (files with unrecognized extensions).

Example usage:
  [[!inline pagenames="somefile.txt" template="raw" feeds="no"]]

Also raise an error in IkiWiki::pagetype($file) if $file is blank,
which avoids trying to do much with missing files, etc.

13 years agoFix WikiLinnk -> Wikilink typo in ltio.mdwn.
W. Trevor King [Tue, 5 Oct 2010 12:29:35 +0000 (08:29 -0400)]
Fix WikiLinnk -> Wikilink typo in ltio.mdwn.

13 years ago(no commit message)
PeteG [Tue, 5 Oct 2010 02:30:25 +0000 (02:30 +0000)]

13 years agoBug: UTF-16 and UTF-32 are unhandled: New
JoeRayhawk [Tue, 5 Oct 2010 01:09:42 +0000 (01:09 +0000)]
Bug: UTF-16 and UTF-32 are unhandled: New

13 years agoMerge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Joey Hess [Mon, 4 Oct 2010 21:03:21 +0000 (17:03 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

13 years agosecond review pass and I have a revert branch now
Joey Hess [Mon, 4 Oct 2010 20:58:55 +0000 (16:58 -0400)]
second review pass and I have a revert branch now

13 years agoinline.pm: Strip trailing whitespace and replace spaces with tabs.
W. Trevor King [Mon, 4 Oct 2010 19:08:28 +0000 (15:08 -0400)]
inline.pm: Strip trailing whitespace and replace spaces with tabs.

13 years agoDocumented the linktoimgonly plugin.
W. Trevor King [Mon, 4 Oct 2010 19:05:07 +0000 (15:05 -0400)]
Documented the linktoimgonly plugin.

13 years agoUpdated linktoimgonly.pm to use htmllink().
W. Trevor King [Mon, 4 Oct 2010 18:42:47 +0000 (14:42 -0400)]
Updated linktoimgonly.pm to use htmllink().

Following Joey's suggestion in
  doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn

I also altered the directive syntax:
  [[!ltio img="image1.jpg"]]
is now
  [[!ltio image1.jpg]]

13 years agoFix name in template directive for mdwn_itex plugin.
W. Trevor King [Mon, 4 Oct 2010 18:41:42 +0000 (14:41 -0400)]
Fix name in template directive for mdwn_itex plugin.

13 years agoAdded Javier Rojas' linktoimgonly.pm plugin.
Javier Rojas [Mon, 4 Oct 2010 18:20:09 +0000 (14:20 -0400)]
Added Javier Rojas' linktoimgonly.pm plugin.

From
  http://devnull.li/~jerojasro/files/linktoimgonly.pm

13 years agoDocument mdwn_itex plugin.
W. Trevor King [Mon, 4 Oct 2010 18:13:41 +0000 (14:13 -0400)]
Document mdwn_itex plugin.

13 years agoUpdated mdwn_itex.pm for Ikiwiki 3.00.
W. Trevor King [Mon, 4 Oct 2010 17:38:00 +0000 (13:38 -0400)]
Updated mdwn_itex.pm for Ikiwiki 3.00.

13 years agoAdded Jason Blevins' mdwn_itex.pm plugin.
Jason Blevins [Mon, 4 Oct 2010 17:35:49 +0000 (13:35 -0400)]
Added Jason Blevins' mdwn_itex.pm plugin.

From
  http://jblevins.org/git/ikiwiki/plugins.git/plain/mdwn_itex.pm

13 years agoMerge branch 'master' of git://git.ikiwiki.info
W. Trevor King [Mon, 4 Oct 2010 17:31:28 +0000 (13:31 -0400)]
Merge branch 'master' of git://git.ikiwiki.info

13 years agofix a little typo
https://www.google.com/accounts/o8/id?id=AItOawm0-WSZnp73Gr2n4a4tmxVPY5kUE50lYH4 [Mon, 4 Oct 2010 17:13:25 +0000 (17:13 +0000)]
fix a little typo

13 years agoAdding blog dependencies
https://www.google.com/accounts/o8/id?id=AItOawm0-WSZnp73Gr2n4a4tmxVPY5kUE50lYH4 [Mon, 4 Oct 2010 16:20:13 +0000 (16:20 +0000)]
Adding blog dependencies

13 years agoMerge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Joey Hess [Mon, 4 Oct 2010 14:54:44 +0000 (10:54 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

13 years agoAdding apache2 dependencies to enable CGI
https://www.google.com/accounts/o8/id?id=AItOawm0-WSZnp73Gr2n4a4tmxVPY5kUE50lYH4 [Mon, 4 Oct 2010 14:34:35 +0000 (14:34 +0000)]
Adding apache2 dependencies to enable CGI

13 years agoUpdated French program translation. Closes: #598918
Joey Hess [Sun, 3 Oct 2010 16:34:58 +0000 (12:34 -0400)]
Updated French program translation. Closes: #598918

13 years agoAdded a comment: New dump plugin
https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs [Sun, 3 Oct 2010 00:45:47 +0000 (00:45 +0000)]
Added a comment: New dump plugin

13 years agoclose
Joey Hess [Sat, 2 Oct 2010 16:03:33 +0000 (12:03 -0400)]
close

13 years agoMerge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Joey Hess [Sat, 2 Oct 2010 16:03:04 +0000 (12:03 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

13 years agofixups tidy change
Joey Hess [Sat, 2 Oct 2010 16:02:34 +0000 (12:02 -0400)]
fixups tidy change

Need checkconfig hook; examples don't become default values.

13 years agotag as patch, I think this version is ready for review
http://smcv.pseudorandom.co.uk/ [Sat, 2 Oct 2010 13:57:03 +0000 (13:57 +0000)]
tag as patch, I think this version is ready for review

13 years agotested and seems to work
http://smcv.pseudorandom.co.uk/ [Sat, 2 Oct 2010 13:52:45 +0000 (13:52 +0000)]
tested and seems to work

13 years agofix typo spotted by lintian
Simon McVittie [Sat, 2 Oct 2010 12:56:15 +0000 (13:56 +0100)]
fix typo spotted by lintian

13 years ago(no commit message)
https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs [Fri, 1 Oct 2010 23:14:28 +0000 (23:14 +0000)]

13 years agoworkaround
http://smcv.pseudorandom.co.uk/ [Fri, 1 Oct 2010 23:01:36 +0000 (23:01 +0000)]
workaround

13 years agoclarification: too many things called cgiurl
http://smcv.pseudorandom.co.uk/ [Fri, 1 Oct 2010 22:50:26 +0000 (22:50 +0000)]
clarification: too many things called cgiurl

13 years ago(no commit message)
https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs [Fri, 1 Oct 2010 22:48:29 +0000 (22:48 +0000)]

13 years agohow much indentation does a code block in a bullet point need? we just don't know
http://smcv.pseudorandom.co.uk/ [Fri, 1 Oct 2010 22:46:50 +0000 (22:46 +0000)]
how much indentation does a code block in a bullet point need? we just don't know

13 years agoupdated branch; fold discussion of rejected version into a toggleable
http://smcv.pseudorandom.co.uk/ [Fri, 1 Oct 2010 22:43:52 +0000 (22:43 +0000)]
updated branch; fold discussion of rejected version into a toggleable

13 years agoContinuing discussion about reverting via the web interface.
PeteG [Fri, 1 Oct 2010 04:20:03 +0000 (04:20 +0000)]
Continuing discussion about reverting via the web interface.

13 years ago done, PEBKAC. Thank you for your time :)
http://jmtd.livejournal.com/ [Thu, 30 Sep 2010 21:57:39 +0000 (21:57 +0000)]
 done, PEBKAC. Thank you for your time :)

13 years agogah
http://jmtd.livejournal.com/ [Thu, 30 Sep 2010 21:49:55 +0000 (21:49 +0000)]
gah

13 years agoMerge branch 'master' of git://git.ikiwiki.info
W. Trevor King [Thu, 30 Sep 2010 14:36:48 +0000 (10:36 -0400)]
Merge branch 'master' of git://git.ikiwiki.info

13 years agoPoint to my updated mdwn_itex plugin.
https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA [Thu, 30 Sep 2010 13:49:37 +0000 (13:49 +0000)]
Point to my updated mdwn_itex plugin.

13 years agoCreated "configurable tidy" todo item.
https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA [Thu, 30 Sep 2010 12:17:14 +0000 (12:17 +0000)]
Created "configurable tidy" todo item.

13 years agoMake tidy command line configurable for the htmltidy plugin.
W. Trevor King [Thu, 30 Sep 2010 11:53:37 +0000 (07:53 -0400)]
Make tidy command line configurable for the htmltidy plugin.

13 years agoremoved
http://jmtd.livejournal.com/ [Thu, 30 Sep 2010 09:00:39 +0000 (09:00 +0000)]
removed

13 years agolists and bullets
http://jmtd.livejournal.com/ [Thu, 30 Sep 2010 08:59:12 +0000 (08:59 +0000)]
lists and bullets

13 years ago+branchable link, demo of actiontabs
http://jmtd.livejournal.com/ [Thu, 30 Sep 2010 08:57:56 +0000 (08:57 +0000)]
+branchable link, demo of actiontabs

13 years agocode and lists
http://jmtd.livejournal.com/ [Thu, 30 Sep 2010 08:55:04 +0000 (08:55 +0000)]
code and lists

13 years agoMerge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Joey Hess [Wed, 29 Sep 2010 16:00:34 +0000 (12:00 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

13 years agoFix test suite failure on other side of date line.
Joey Hess [Wed, 29 Sep 2010 15:58:45 +0000 (11:58 -0400)]
Fix test suite failure on other side of date line.

13 years ago(no commit message)
https://www.google.com/accounts/o8/id?id=AItOawnZyXrBJHCbhjyf69drmoWxbsEex_bQhEk [Wed, 29 Sep 2010 10:15:04 +0000 (10:15 +0000)]

13 years ago(no commit message)
https://www.google.com/accounts/o8/id?id=AItOawnZyXrBJHCbhjyf69drmoWxbsEex_bQhEk [Wed, 29 Sep 2010 10:12:52 +0000 (10:12 +0000)]

13 years ago(no commit message)
PeteG [Wed, 29 Sep 2010 04:22:10 +0000 (04:22 +0000)]

13 years agoalternative approach with untested branch
http://smcv.pseudorandom.co.uk/ [Wed, 29 Sep 2010 00:28:14 +0000 (00:28 +0000)]
alternative approach with untested branch

13 years agoadd todo page for web reversion, with code review of patch
Joey Hess [Tue, 28 Sep 2010 21:07:01 +0000 (17:07 -0400)]
add todo page for web reversion, with code review of patch

13 years agoadd reference to peteg's revert code
Joey Hess [Tue, 28 Sep 2010 20:34:43 +0000 (16:34 -0400)]
add reference to peteg's revert code

13 years agobetter tags
https://www.google.com/accounts/o8/id?id=AItOawnZyXrBJHCbhjyf69drmoWxbsEex_bQhEk [Tue, 28 Sep 2010 19:24:07 +0000 (19:24 +0000)]
better tags

13 years agoinitial page
https://www.google.com/accounts/o8/id?id=AItOawnZyXrBJHCbhjyf69drmoWxbsEex_bQhEk [Tue, 28 Sep 2010 19:01:50 +0000 (19:01 +0000)]
initial page

13 years agotest case
Joey Hess [Mon, 27 Sep 2010 22:47:13 +0000 (18:47 -0400)]
test case

13 years agoprobably PEBKAC (but still haven't figured it out)
http://jmtd.livejournal.com/ [Mon, 27 Sep 2010 22:17:29 +0000 (22:17 +0000)]
probably PEBKAC (but still haven't figured it out)

13 years agoparameterize FIND and SED
Joey Hess [Mon, 27 Sep 2010 20:10:13 +0000 (16:10 -0400)]
parameterize FIND and SED

13 years agotemplate_depends: throw nice error message when template cannot be found
Joey Hess [Mon, 27 Sep 2010 19:47:14 +0000 (15:47 -0400)]
template_depends: throw nice error message when template cannot be found

plovs reported a crash when templates were not installed properly,
with a non-useful error about the template object not being defined.
I've audited all uses of template_depends(), and template(), and it makes
sense for them to throw an error if the template cannot be found. All code
with a user-supplied template catches errors already, to handle template
parse failures.

It did not make sense for template_file to throw errors, as some code uses
it to probe if a template file is available.

13 years agoavoid fatal error if aggregate page template could not be found
Joey Hess [Mon, 27 Sep 2010 19:44:04 +0000 (15:44 -0400)]
avoid fatal error if aggregate page template could not be found

That template is user-controlled.

13 years agoresponse
Joey Hess [Mon, 27 Sep 2010 19:36:05 +0000 (15:36 -0400)]
response

13 years agoyay https
http://smcv.pseudorandom.co.uk/ [Mon, 27 Sep 2010 18:48:58 +0000 (18:48 +0000)]
yay https

13 years agoadd news item for ikiwiki 3.20100926
Joey Hess [Mon, 27 Sep 2010 04:56:26 +0000 (00:56 -0400)]
add news item for ikiwiki 3.20100926

13 years agoreleasing version 3.20100926 3.20100926
Joey Hess [Mon, 27 Sep 2010 04:56:03 +0000 (00:56 -0400)]
releasing version 3.20100926

13 years agoreview
Joey Hess [Mon, 27 Sep 2010 03:01:01 +0000 (23:01 -0400)]
review

13 years agoMerge remote branch 'remotes/smcv/ready/htmlbalance'
Joey Hess [Mon, 27 Sep 2010 02:44:52 +0000 (22:44 -0400)]
Merge remote branch 'remotes/smcv/ready/htmlbalance'

13 years agohtmlbalance: Fix compatability with HTML::Tree 4.0. (smcv)
Joey Hess [Mon, 27 Sep 2010 02:37:18 +0000 (22:37 -0400)]
htmlbalance: Fix compatability with HTML::Tree 4.0. (smcv)

13 years agoMerge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Joey Hess [Mon, 27 Sep 2010 02:27:50 +0000 (22:27 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

13 years agoPropigate PATH into wrapper.
Joey Hess [Mon, 27 Sep 2010 02:27:46 +0000 (22:27 -0400)]
Propigate PATH into wrapper.

In the last version, the ikiwiki script stopped setting PATH.
But that leads to gcc failing when run from websetup. See
http://www.branchable.com/bugs/Crashes_when_rebuilding_wiki_after_setup_change/

13 years agosign
http://smcv.pseudorandom.co.uk/ [Sun, 26 Sep 2010 21:54:32 +0000 (21:54 +0000)]
sign

13 years agosign my change
http://smcv.pseudorandom.co.uk/ [Sun, 26 Sep 2010 21:53:54 +0000 (21:53 +0000)]
sign my change

13 years ago+patch
http://smcv.pseudorandom.co.uk/ [Sun, 26 Sep 2010 21:53:00 +0000 (21:53 +0000)]
+patch