Merge branch 'master' of orgmode.org:org-mode
commit1298b6468a7172923132e665b9870ec2a5699697
authorBastien Guerry <bzg@altern.org>
Fri, 15 Feb 2013 15:48:40 +0000 (15 16:48 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 15 Feb 2013 15:48:40 +0000 (15 16:48 +0100)
tree418eab4578bf7011e84fca1954c53604a425a5d5
parent7306e04193a3e3921b1e5ca40517f4eddd9ee45f
parent0b6a2e2416b0acc28469661d7013f92f82a34267
Merge branch 'master' of orgmode.org:org-mode
lisp/org.el