Merge branch 'maint'
commitd9649ca7a2cc1c955530e86240e64aa11196c991
authorNicolas Goaziou <n.goaziou@gmail.com>
Tue, 8 Jan 2013 09:36:47 +0000 (8 10:36 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Tue, 8 Jan 2013 09:36:47 +0000 (8 10:36 +0100)
treefd46c532ed3e7f31ae6f9ec8c85a7250091d231c
parente2f95037e4571d17d6ab33107135b72bcd7c9056
parent7684fbd6a227f0ad182661fd7eb17a9e13dc4695
Merge branch 'maint'
lisp/org.el