Merge branch sneakypete81/release-0.4 into development

This commit is contained in:
sneakypete81 2013-07-20 18:29:39 +01:00
commit 2ca492075c

View file

@ -12,8 +12,8 @@ Trovebox Python Library
:target: https://pypi.python.org/pypi/trovebox
This library works with any Trovebox server, either
`Self-hosted <https://github.com/photo>`__, or using the
`Trovebox hosted service <http://trovebox.com>`__).
`self-hosted <https://github.com/photo>`__, or using the hosted service at
`trovebox.com <http://trovebox.com>`__.
It provides full access to your photos and metadata, via a simple
Pythonic API.