annotate .svn/pristine/f0/f026f224eb4c0649e6564cb83c457e8f8ea91f27.svn-base @ 1621:3a510bf6a9bc

Merge from live branch

api.array :roles do
  @roles.each do |role|
    api.role do
      api.id role.id
      api.name role.name
    end
  end
end