History | View | Annotate | Download (421 Bytes)
Merge remote-tracking branch 'origin/master'
Conflicts: .classpath src/com/rackspace/cloud/files/api/client/ContainerManager.java src/com/rackspace/cloud/files/api/client/CustomHttpClient.java src/com/rackspace/cloud/servers/api/client/Account.java src/com/rackspace/cloud/servers/api/client/Backup.java...
local changes
update package info
Small bug fixes
added google analytics activity superclasses and activites thattrack now extend these and most of the tracking calls are in place
updated the addserverpage and general clean up
temporary fix for non modifying tasks
addded new features to viewserveractivity
first source commit