Merge branch 'master-fixes' into master-new
commit8a910bd40b182fac1e2f2c76502d9f0b556d1716
authorBastien Guerry <bzg@altern.org>
Tue, 19 Feb 2013 10:05:04 +0000 (19 11:05 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 19 Feb 2013 10:05:04 +0000 (19 11:05 +0100)
tree8717694b84d888a05ec3ad675afd34be2df7b8cd
parent19a0b74ce6b84a2cf1f04878030face0601614c4
parent9bec2ec5d017caaf493d9f6c6757b32ce33c83d0
Merge branch 'master-fixes' into master-new
lisp/org.el