Merge branch 'origin-maint'
commit2239d74fd933a7d0e975be5186735d9d8ab99030
authorEric Schulte <eric.schulte@gmx.com>
Sat, 18 Feb 2012 21:50:31 +0000 (18 14:50 -0700)
committerEric Schulte <eric.schulte@gmx.com>
Sat, 18 Feb 2012 21:50:31 +0000 (18 14:50 -0700)
tree258ffe7db5f9dc240a88a4093c5ed6890b5fabf3
parentbe4254876394da71476ae7a1008108bf3c0ccc1e
parent60176c84e5fe5dab9633339d6738312066ade289
Merge branch 'origin-maint'
lisp/ob-sqlite.el