Merge branch 'maint'
commit953b920c9bd1af1f8867146c89ce1e1c12e093c6
authorBastien Guerry <bzg@altern.org>
Sun, 23 Dec 2012 16:31:57 +0000 (23 17:31 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 23 Dec 2012 16:31:57 +0000 (23 17:31 +0100)
tree75b8e354ed132726eb13d28ba1c873490c07f878
parent8c53cc820e2c16f866eb91312eff0448a5ca3557
parentf0a64ab3b5c46c8c7b1c838de2ed20511357e43d
Merge branch 'maint'
lisp/org-clock.el
lisp/org-table.el
lisp/org.el