Merge branch 'master' of orgmode.org:org-mode
commit58885997b642ed68cd0ee4a80ffaabf5e9eccf01
authorBastien Guerry <bzg@altern.org>
Thu, 23 Aug 2012 09:51:24 +0000 (23 11:51 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 23 Aug 2012 09:51:24 +0000 (23 11:51 +0200)
treee4624e8893ae0b2bf3ded59a36b428a855f6c469
parentd378c7b41b4cf8d50510d7d9121197993122c95c
parentf9e5600f826460f85fabbcbb8dca33e50af33475
Merge branch 'master' of orgmode.org:org-mode