Merge branch 'master' of orgmode.org:org-mode
commit7e155ecfbcc7358c6c8b09b7d9cd872d4a8d393f
authorBastien Guerry <bzg@altern.org>
Sat, 28 Apr 2012 20:24:32 +0000 (28 22:24 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 28 Apr 2012 20:24:32 +0000 (28 22:24 +0200)
tree093b0c0bac3935ff9b05ac93d341e72a1b7aedf4
parent982b7b972f2927b9f92b55e08e0dcacb21a015bd
parent3621634861c5cbfebb3fb950f6e9c37cbf0575b9
Merge branch 'master' of orgmode.org:org-mode