Stephen Ficklin 38d6b34898 Fixed merge conflicts %!s(int64=11) %!d(string=hai) anos
..
importers 38d6b34898 Fixed merge conflicts %!s(int64=11) %!d(string=hai) anos
tripal_pub.admin.inc 8287eb8a21 Pub: cleaned up doc %!s(int64=11) %!d(string=hai) anos
tripal_pub.chado_node.inc 19137be811 Updated API to use new function names %!s(int64=11) %!d(string=hai) anos
tripal_pub.pub_citation.inc 19137be811 Updated API to use new function names %!s(int64=11) %!d(string=hai) anos
tripal_pub.pub_importers.inc 38d6b34898 Fixed merge conflicts %!s(int64=11) %!d(string=hai) anos
tripal_pub.pub_search.inc e17f584dd7 Working on Pub API... checking in to pull %!s(int64=11) %!d(string=hai) anos