merge feed reader api
authorEugene Petrenko <eugene.petrenko@gmail.com>
Fri, 12 Aug 2011 15:51:33 +0000 (19:51 +0400)
committerEugene Petrenko <eugene.petrenko@gmail.com>
Fri, 12 Aug 2011 15:51:33 +0000 (19:51 +0400)
commit0c5c32b5f68c46ce8edcb4162ae536e18ada8a44
tree43c91d951ec6394833aaa8dffc7401d506acb69b
parente65cf3f4e4ae17391c0f06e4cc1062feaa50e36a
parent0386be202f7dc14ce56303890a0a04850ac226f8
merge feed reader api

Conflicts:
nuget-server/nuget-server.iml
nuget-server/src/META-INF/build-server-plugin-nuget.xml
nuget-server/nuget-server.iml
nuget-server/src/META-INF/build-server-plugin-nuget.xml