Merge branch 'master' of orgmode.org:org-mode
commite03fc31ee1d3cfa4c7b712324c351a13a8117c3d
authorBastien Guerry <bzg@altern.org>
Sat, 28 Jan 2012 14:58:28 +0000 (28 15:58 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 28 Jan 2012 14:58:28 +0000 (28 15:58 +0100)
tree942df2e44897436036147465c766b6f7b23d68a2
parent10186915cc19f6c8c6b65a4a0d071928d7f7d922
parentff19cf5728235018c8156101c54496bb90feb7d7
Merge branch 'master' of orgmode.org:org-mode