Merge branch 'master' of orgmode.org:org-mode
commitf9be7f342238aefae2353a43921e5209bf9e6412
authorBastien Guerry <bzg@altern.org>
Mon, 1 Jul 2013 20:57:41 +0000 (1 22:57 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 1 Jul 2013 20:57:41 +0000 (1 22:57 +0200)
treee84004235e5dc29e2b6b03cd9b83d05f08a1bbad
parent68e1ededffee674bdc6b6a352fa18737e9972cf3
parent8387b3b07e8c813aabbd70a344ac9d9e02b77ba8
Merge branch 'master' of orgmode.org:org-mode