Merge branch 'origin-maint'
commitebfef5c0a580bfa28ec417dce2c0ae957753c4c2
authorEric Schulte <eric.schulte@gmx.com>
Sat, 18 Feb 2012 16:26:12 +0000 (18 09:26 -0700)
committerEric Schulte <eric.schulte@gmx.com>
Sat, 18 Feb 2012 16:26:12 +0000 (18 09:26 -0700)
tree6de57a5a4589e29de54853fefc18884c3e714fd2
parent9a156196544ab15e77bee90b07df0f8c23c13be3
parente744db1ad1396380ee056f72f52190091738dcd4
Merge branch 'origin-maint'
lisp/ob-sql.el