Merge branch 'master' of orgmode.org:org-mode
commit8d7aa7dfa87433077d40e2dcab982fb537621e66
authorBastien Guerry <bzg@altern.org>
Mon, 2 Jan 2012 18:52:50 +0000 (2 19:52 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 2 Jan 2012 18:52:50 +0000 (2 19:52 +0100)
tree23e26dbf97c56240d06213249719735055e06f89
parentb73075a8d2303f2b943d5421e39ca5839fe922d7
parentc2ee31fa44204dae970576e6875388a3a2d5e3d9
Merge branch 'master' of orgmode.org:org-mode