Merge branch 'master' of orgmode.org:org-mode
commit0880c35c485d3140c19ea6197de2c23621c7c939
authorBastien Guerry <bzg@altern.org>
Thu, 18 Apr 2013 10:31:05 +0000 (18 12:31 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 18 Apr 2013 10:31:05 +0000 (18 12:31 +0200)
tree0433a39c9e91996e7cb00e3ddd98988cc38e565f
parent03920a01fa12091dd6df892c26f836743cd5560f
parentb48da0158d2d69f66eda0f0cee0139b79175a210
Merge branch 'master' of orgmode.org:org-mode