Merge branch 'master' of orgmode.org:org-mode
commitc79320d5cf5c1f2090560787394afabfd1c6675a
authorBastien Guerry <bzg@altern.org>
Fri, 3 Aug 2012 12:09:54 +0000 (3 14:09 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 3 Aug 2012 12:09:54 +0000 (3 14:09 +0200)
tree497f44d43ca2b227a32ce26a7d0b177ec078d580
parent1e34c5d34f61823fb1671d72d95e6547950043db
parentd69de79e4ac2ff78456ce2d6408e9af11c882771
Merge branch 'master' of orgmode.org:org-mode