Merge branch 'master-wip'
commit917cc1d516e7441a9dad88b119292c610e8d6a92
authorBastien Guerry <bzg@altern.org>
Sat, 23 Feb 2013 10:48:21 +0000 (23 11:48 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 23 Feb 2013 10:48:21 +0000 (23 11:48 +0100)
tree1fea4811a4db49bdf0cf2c6365624942b8770829
parent65bacaac73e405b3143732c8304d75a1ce990796
parent82899fa841dc010085109ecdb918c7027df3a8d3
Merge branch 'master-wip'
lisp/org.el
lisp/ox.el