Merge branch 'master' of orgmode.org:org-mode
commit551ad2513578d624891b9f85a9a8e11bc1458b99
authorBastien Guerry <bzg@altern.org>
Tue, 24 Jan 2012 16:20:28 +0000 (24 17:20 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 24 Jan 2012 16:20:28 +0000 (24 17:20 +0100)
tree15b976af0df2cf1f0794b0d01338f96e20f6ecd9
parentefc3bdf3f3d916dc4a406ee7147dd43098d77a9d
parentafb9860487edc467b56cd3ac481e3eee3032feb6
Merge branch 'master' of orgmode.org:org-mode