Merge branch 'maint'
commitbd0f9b8052036f9733adc6511f721a7d20f3215d
authorBastien Guerry <bzg@altern.org>
Tue, 11 Feb 2014 14:39:23 +0000 (11 15:39 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 11 Feb 2014 14:39:23 +0000 (11 15:39 +0100)
tree75e7f23f44e0113a30a8e73f5c685f83306d38c7
parent5edf83c69420babb62e25e2f9e925d656706bb79
parentb84559f422711034858e508d9ee6e594f97920e0
Merge branch 'maint'
lisp/org-colview.el