Merge branch 'master' of orgmode.org:org-mode
commit855dcfbf2ab8870e2f5b75adfe719256c5c887ca
authorBastien Guerry <bzg@altern.org>
Wed, 20 Mar 2013 00:00:24 +0000 (20 01:00 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 20 Mar 2013 00:00:24 +0000 (20 01:00 +0100)
treed59ef8706e4287553492c94afc66686a5f9dee8d
parent9c1ea74c2b05f49bda6012a4e5c8451a86071303
parent78b3a0398124aff412606438b851f315078485e4
Merge branch 'master' of orgmode.org:org-mode