Stephen Ficklin 7739c32661 Fixed merge conflict %!s(int64=7) %!d(string=hai) anos
..
remote__data 7739c32661 Fixed merge conflict %!s(int64=7) %!d(string=hai) anos
WebServicesField.inc cdbf0732c2 initial cross site field implementation %!s(int64=7) %!d(string=hai) anos
WebServicesFieldFormatter.inc a2ff1e0c1b new web services remote data field %!s(int64=8) %!d(string=hai) anos
WebServicesFieldWidget.inc cdbf0732c2 initial cross site field implementation %!s(int64=7) %!d(string=hai) anos