Merge branch 'master' of orgmode.org:org-mode
commit15c2a501106b1784d71b8637354ba357da919893
authorEric Schulte <eric.schulte@gmx.com>
Mon, 2 Jan 2012 18:02:54 +0000 (2 11:02 -0700)
committerEric Schulte <eric.schulte@gmx.com>
Mon, 2 Jan 2012 18:02:54 +0000 (2 11:02 -0700)
treeb11c38e2611e95efa8cae8ac9d18e5fdbb5af502
parent9e4a6f37811088ceccbd6a6c64a162a99128c7e6
parentb120a7b35d944e095369c9a3f69127f0ff2ec44d
Merge branch 'master' of orgmode.org:org-mode