Merge branch 'maint' of orgmode.org:org-mode into maint
commitdb28a7a0abc271abecca29878e629d93703493c9
authorBastien Guerry <bzg@altern.org>
Tue, 18 Dec 2012 23:23:59 +0000 (19 00:23 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 18 Dec 2012 23:23:59 +0000 (19 00:23 +0100)
tree4d1041cdc584370b5864be6c89785e05d392d57a
parent1c57cd5a7d1b28353e7bd7a948f602137b6b00ec
parent7739e8b5f7d81319b647043c2a9f6d9ef7eb813b
Merge branch 'maint' of orgmode.org:org-mode into maint