Hide magic (do nothing) buttons
Fix grammar to clarify sentence in reset-password.phtml
Merge pull request #139 from rowanthorpe/small-grammar-fix

Fix grammar to clarify sentence in reset-password.phtml
[BF] Catch linked objects on deletion and issue a readable error message - fixes #140
Merge branch 'master' of https://github.com/inex/IXP-Manager
Ignore OSX files
[IM] Limit switch list to active switches only

You can opt to include inactive switches and to also display console switches.

WHen you do, these choices are retained for the session.
Merge branch 'im-switch-view'
[NF] Add route server prefix analysis tool script

See: https://github.com/inex/IXP-Manager/wiki/Route-Server-Prefix-Analysis-Tool
[IM] Disable this be default as it requires some work to configure
Version bump
Fix support / contact urls
[BF] Fix DateTime to string conversion (introducted in move from Doctrine 1.2 ->2)
Merge branch 'inex-live'
[BF] Fix #148 - contacts listed multiple times
Merge branch 'inex-live'
[IM] Allow changing switchport active status without setting port type - closes #146
[IM] Add tag field to location forms - closes #144
[BF] Fix contact list by role when cardinality of the set is zero - fixes #142
[IM] Increased verbosity to help with #149