Merge branch 'master' of orgmode.org:org-mode
commitdd6ee0e1b5ee13d3fdf1db40ed6954eb36b290ca
authorBastien Guerry <bzg@altern.org>
Thu, 26 Apr 2012 13:16:05 +0000 (26 15:16 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 26 Apr 2012 13:16:05 +0000 (26 15:16 +0200)
tree26ca921d4d047b7c2be0da65e77004912935cf0f
parentfe0515e5bfcdf07307c1e24d33b12faf6771836a
parentc6dc6e3d32619c84d1690b6f67a3b4702b0f2282
Merge branch 'master' of orgmode.org:org-mode