Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Tue, 22 Jan 2013 12:57:57 +0000 (13:57 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 22 Jan 2013 12:57:57 +0000 (13:57 +0100)
commit627b3faa3d720ff02fa777c5fe74088fbf45dba3
tree3e68747a39b9bc49647d7244f2464d3c59192d38
parentf7f1b4bb7eeeff603bdbeeea1b9da07809c13b5b
parenta85b393994d9dcfe12a457c5c9dd62d9090bdb06
Merge branch 'maint'

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