Merge branch 'master' of orgmode.org:org-mode
commit227bc3b7025758d98ffc43a7f746eff779e03744
authorBastien Guerry <bzg@altern.org>
Sat, 6 Apr 2013 21:17:41 +0000 (6 23:17 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 6 Apr 2013 21:17:41 +0000 (6 23:17 +0200)
tree495f84354f5d5e7a55e92c7fc205bfed150711cf
parent46cca57cb994bb6e7163c154cb66b152b63073a8
parent09cb6d3f2124dc2f9c9818b7ed8078a6763fed25
Merge branch 'master' of orgmode.org:org-mode