Merge branch 'master' of orgmode.org:org-mode
commitb4f41f7d4233a2b3fa4a0c60690168068ef2e328
authorBastien Guerry <bzg@altern.org>
Fri, 8 Feb 2013 16:18:03 +0000 (8 17:18 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 8 Feb 2013 16:18:03 +0000 (8 17:18 +0100)
treecf5071d2f8a806698aa20d7f9793e56488a117a8
parent22e9c264fd134fdc2cfe66a2cb939ec85b635bcd
parent6c96c9475fccd5237df92db4fcbc6c2e3dd21e01
Merge branch 'master' of orgmode.org:org-mode