Stephen Ficklin 618a7bd362 Fixed merge conflict %!s(int64=7) %!d(string=hai) anos
..
TripalContentService_v0_1.inc 618a7bd362 Fixed merge conflict %!s(int64=7) %!d(string=hai) anos
TripalVocabService_v0_1.inc 784422e678 Bundle fields are now present in WS API Docs %!s(int64=7) %!d(string=hai) anos