Merge branch 'adc1b43'
authorJohn Kitchin <jkitchin@andrew.cmu.edu>
Sat, 24 Jan 2015 15:28:53 +0000 (10:28 -0500)
committerJohn Kitchin <jkitchin@andrew.cmu.edu>
Sat, 24 Jan 2015 15:28:53 +0000 (10:28 -0500)
1  2 
jmax-bibtex.el

diff --cc jmax-bibtex.el
Simple merge