Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Sat, 26 Jan 2013 14:11:21 +0000 (15:11 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 26 Jan 2013 14:11:21 +0000 (15:11 +0100)
commit5e11659e66845e918a047f4a89d171f599729174
tree73df3ce9c6fc767b4d8b3bf2253f5f73e03170eb
parent714b3722784364f34dbb9a8b28039938806726aa
parenta1196499237b6a0389fba2d21b69c34068404519
Merge branch 'maint'

Conflicts:
lisp/org.el
lisp/org.el