Merge branch 'master' of orgmode.org:org-mode
commit1ceddf16152cebf43fe9256067b5f63dd3f70a89
authorBastien Guerry <bzg@altern.org>
Tue, 22 Feb 2011 12:39:37 +0000 (22 13:39 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 22 Feb 2011 12:39:37 +0000 (22 13:39 +0100)
treefd69c8a89607ae1c052cd8e54741d6060acb722e
parent6a6c35a94f7ec9bb25ec8319c83519634de93e01
parenta821f4e922b0018112da807b0d8de283159a421d
Merge branch 'master' of orgmode.org:org-mode