Stephen Ficklin 38d6b34898 Fixed merge conflicts %!s(int64=11) %!d(string=hai) anos
..
tripal_pub.DEPRECATED.inc 19137be811 Updated API to use new function names %!s(int64=11) %!d(string=hai) anos
tripal_pub.api.inc 38d6b34898 Fixed merge conflicts %!s(int64=11) %!d(string=hai) anos