Merge branch 'maint'
commit5de94e46e46b37a7ec1ed486a6400f17d00bf611
authorBastien Guerry <bzg@altern.org>
Thu, 20 Dec 2012 12:16:47 +0000 (20 13:16 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 20 Dec 2012 12:16:47 +0000 (20 13:16 +0100)
tree39c6457f2507f653710e79f7c57ffcf232f1f7ab
parent12d53240e9ea0bb70ab4ec2bcfa90c51f7800a9b
parentbfb9f9d10fe7db2e45cd925567beb824f6d67397
Merge branch 'maint'
contrib/lisp/org-invoice.el
lisp/org-agenda.el
lisp/org-capture.el
lisp/org-colview-xemacs.el
lisp/org-colview.el
lisp/org-table.el
lisp/org.el