Update openhab_default.cfg
rebase of default openhab.cfg
TCP configuration added to openhab.cfg
Revert "TCP configuration added to openhab.cfg"

This reverts commit 4696de08305be0e0ef85e42a366f0f41487cc3f7.
Revert "rebase of default openhab.cfg"

This reverts commit 30d63c640ef8d052a88e812e9ba942ae91dfdc77.
Revert "Update openhab_default.cfg"

This reverts commit 8f193462f554d2337232b5170301be80875f79f2.
Original default.cfg with TCP config added. Hope this is correct now
- Prowl: Proposed change to allow multiple API keys to be supported
Merge pull request #8 from jspuij/prowl

- Prowl: Proposed change to allow multiple API keys to be supported
Merge remote-tracking branch 'upstream/master' into plugwise
Merge branch 'tcp' into plugwise