Merge branch 'origin-maint'
commitc67705a708e063b906b7822a44c986b5d22a76db
authorEric Schulte <eric.schulte@gmx.com>
Sat, 18 Feb 2012 15:28:50 +0000 (18 08:28 -0700)
committerEric Schulte <eric.schulte@gmx.com>
Sat, 18 Feb 2012 15:28:50 +0000 (18 08:28 -0700)
treebcf185b003a7101ae49e7d0a6613c4e848d8592d
parent5935b59698ac2c44942a2668f20a315164407ad0
parentbf238997a9e173355be7b14d692249d674b11e34
Merge branch 'origin-maint'
lisp/org.el