Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Wed, 24 Oct 2012 10:49:30 +0000 (12:49 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 24 Oct 2012 10:49:30 +0000 (12:49 +0200)
commit1886af4337e802806ff8873822ccbd2e3763aa07
tree70233405bec692dc04cd83e6babe3241eb8b8120
parent886e4f56e53ba29919aefafcd9659610f18d4fa2
parent1fc41ca61e8f7f08c57e55ad688482d956d3ccf3
Merge branch 'maint'

Conflicts:
lisp/org.el
lisp/org.el