Merge branch 'master' of orgmode.org:org-mode
commit97ac24417aad6fe7dc3ce98851f8ecca5bc5593c
authorBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 07:39:27 +0000 (29 09:39 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 07:39:27 +0000 (29 09:39 +0200)
treeca4bd6e32690934cb9063f5662e7d16ec25389cb
parent33ab30ca2a03eccfe0245e03b66beb9465a98e6c
parentdadc875d9fa7c2389efb2ad12a3aea5981ab7f34
Merge branch 'master' of orgmode.org:org-mode