Merge branch 'master-fixes'
commit8c53cc820e2c16f866eb91312eff0448a5ca3557
authorBastien Guerry <bzg@altern.org>
Sun, 23 Dec 2012 16:20:55 +0000 (23 17:20 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 23 Dec 2012 16:20:55 +0000 (23 17:20 +0100)
tree4ba24ab0b42b31100bb69cc8cbb2aadbdf02c499
parent9f1f0535bec62c8a0566f48c551ad97dced7b05b
parent2861bfc7122c281b02043c1ff6a53e340ef7dd99
Merge branch 'master-fixes'
lisp/org.el