Merge branch 'master' of orgmode.org:org-mode
authorBastien Guerry <bzg@altern.org>
Sun, 13 Jan 2013 10:18:00 +0000 (11:18 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 13 Jan 2013 10:18:00 +0000 (11:18 +0100)
commit6b746e20b87be1dc3bd1e472e9fd1cb229ae2cfc
treec21037d92b663ad66a9d51bf7fe15a70df9c9583
parent7369cada30110d602f248c780aab55956ad9f1ae
parent9d26797448123bb5882b3cceac3f35f4a939b430
Merge branch 'master' of orgmode.org:org-mode
lisp/org.el