Stephen Ficklin 38d6b34898 Fixed merge conflicts %!s(int64=11) %!d(string=hai) anos
..
tripal_pub.AGL.inc 65ec564a10 Updated documentation for pub module %!s(int64=11) %!d(string=hai) anos
tripal_pub.PMID.inc 38d6b34898 Fixed merge conflicts %!s(int64=11) %!d(string=hai) anos