Merge branch 'maint' of orgmode.org:org-mode into origin-maint
authorEric Schulte <eric.schulte@gmx.com>
Fri, 20 Jan 2012 17:55:32 +0000 (10:55 -0700)
committerEric Schulte <eric.schulte@gmx.com>
Fri, 20 Jan 2012 17:55:32 +0000 (10:55 -0700)
commit041c68f58621c3576cce6abd8b4a5b6caa74bbb8
tree65108da9455da8882df4a659ef8b8cec4b1973bf
parent70c58b93f1c6ced56d49d3aa501174bb17fc11a7
parentd19a347a8b9ac65dd1fd8aaeaae91d23b7755f3e
Merge branch 'maint' of orgmode.org:org-mode into origin-maint