Merge branch 'master' of orgmode.org:org-mode
commit06c98ceb6068cc92e9308b749cd8eddef09ac743
authorBastien Guerry <bzg@altern.org>
Sat, 12 Jan 2013 13:59:38 +0000 (12 14:59 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 12 Jan 2013 13:59:38 +0000 (12 14:59 +0100)
tree345c33846d9362d4b46c4bc3314e002c78392468
parentfb37d1538de5f3559dd7b81ecd98aeb758400e63
parent0c9579bb74e48608ab6a94f1cf1187b1bf0b1ffe
Merge branch 'master' of orgmode.org:org-mode