Merge branch 'master' of orgmode.org:org-mode
commit2e67699fe1f478f1238b0bf536fd642359816461
authorBastien Guerry <bzg@altern.org>
Mon, 22 Apr 2013 09:26:54 +0000 (22 11:26 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 22 Apr 2013 09:26:54 +0000 (22 11:26 +0200)
tree9f4b0686028b205366cce089385a5484cc6349f7
parentbb0492d7179b402cccc0086ca9aff016c72d2738
parenteab949fc4a25afcad89dbcc3b119a787551330e6
Merge branch 'master' of orgmode.org:org-mode