Merge branch 'master' of orgmode.org:worg
commit0ce70609629aa58f7ecf211251bc02594043ccaa
authorBastien Guerry <bzg@altern.org>
Fri, 5 Apr 2013 18:05:36 +0000 (5 20:05 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 5 Apr 2013 18:05:36 +0000 (5 20:05 +0200)
treea276791a38cabe56252f9bb79ce0c06dcedce86e
parent788dafaecbf4af835021ae02ae147265dd70c9f8
parent59887e242d0a108f5ee4fb64b25162efbbfee3c0
Merge branch 'master' of orgmode.org:worg