Merge branch 'master' of orgmode.org:worg
commita1d8d9d9e1b62d8c1731cec41278693662cfd563
authorBastien Guerry <bzg@altern.org>
Wed, 10 Apr 2013 16:49:31 +0000 (10 18:49 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 10 Apr 2013 16:49:31 +0000 (10 18:49 +0200)
tree32c0776ab632d258c81773605b7d044d3afe8045
parentbb2303c47df8bec1e658aa11e65591acbf68d344
parent88476d1bacf911a2405315c178af95fb25158c31
Merge branch 'master' of orgmode.org:worg