Merge branch 'master' of orgmode.org:org-mode
commit1ca26a755aa8b0ac2b13513b2b09efc2c2f650ab
authorBastien Guerry <bzg@altern.org>
Fri, 15 Mar 2013 10:17:55 +0000 (15 11:17 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 15 Mar 2013 10:17:55 +0000 (15 11:17 +0100)
tree1ea46cd0f7f5c12e808bcd17dbcee98243b1385a
parent6ae1718df56c5c44a000a9027514f6f9286f6e15
parentc66641e1eafed04719cdacba05c65ae62a1e1158
Merge branch 'master' of orgmode.org:org-mode