Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 4 Nov 2012 23:58:34 +0000 (00:58 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 4 Nov 2012 23:58:34 +0000 (00:58 +0100)
commit5acffad561465ce9706299ffbe847269e1ab32f8
treece74bb32935fa1cce27f8938986eedd273e6f3f9
parent7cdfa64677570049bae9d87aa39b0cfb02d7c60d
parentf48a8b7bf821b71ef1426ad0cb38d678cc9bb303
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el