[tx-robot] updated from transifex
[tx-robot] updated from transifex
[tx-robot] updated from transifex
Fix for #416.
[tx-robot] updated from transifex
[tx-robot] updated from transifex
[tx-robot] updated from transifex
Fix for #416.
Merge branch 'master' of https://github.com/owncloud/contacts.git
[tx-robot] updated from transifex
Fixes #351.
Merge branch 'master' of https://github.com/owncloud/contacts.git
Force myself to use be consistent ;)
[tx-robot] updated from transifex
[tx-robot] updated from transifex
[tx-robot] updated from transifex
[tx-robot] updated from transifex
[tx-robot] updated from transifex
[tx-robot] updated from transifex
Merge branch 'master' of https://github.com/owncloud/contacts into import

Conflicts:
	templates/contacts.php