Added ability to configure the PiFace socket timeout and retry attempt properties
Merge branch 'master' of https://github.com/openhab/openhab
Fix for sendXbmcNotification() - wasn't working after recent changes
Fix for sendXbmcNotification() - wasn't working after recent changes
Merge pull request #21 from sumnerboy12/master

Added ability to configure the PiFace socket timeout and retry attempts
Fix for sendXbmcNotification() - wasn't working after recent changes (undo dongyros change)
Merge pull request #23 from sumnerboy12/xbmc-fix

Fix for sendXbmcNotification() - wasn't working after recent changes
Fix sequence of Quartz startup in configureBinding()
Merge pull request #27 from kgoderis/tcppatch

Fix sequence of Quartz startup in configureBinding()
Fix potential null pointer exception if using incorrect interface
declared
Merge pull request #29 from cdjackson/OWServer

Fix potential null pointer exception if using incorrect interface
TCP - set keepalive socket option
Fix null pointer condition in ProtocolGenericBindingProvider
Change the TCP and UDP bindings to be good OH "citizens" by extending
them from AbstractActiveBinding instead of AbstractBinding
 - Abandon Select Quartz job as core processing mechanism
 - Fix Issue #478 - High CPU Load
 - Fix problem where .items are read before binding startup (abandon
bindingUpdated())
MQTT Binding: updated log settings and fixed bug in topic name matching
Merge pull request #31 from kgoderis/tcppatch

TCP/UDP binding - Make good "citizen" + Fix Issue #478 (High CPU Load)
Merge pull request #32 from dvanherbergen/master

MQTT Binding: updated log levels and fixed bug in topic name matching
Merge remote-tracking branch 'upstream/master' into maxcube

Conflicts:
	bundles/action/org.openhab.action.xbmc/src/main/java/org/openhab/action/xbmc/internal/XBMC.java
	bundles/binding/org.openhab.binding.piface/src/main/java/org/openhab/binding/piface/internal/PifaceBinding.java
	bundles/binding/org.openhab.binding.tcp/src/main/java/org/openhab/binding/tcp/AbstractDatagramChannelBinding.java
	bundles/binding/org.openhab.binding.tcp/src/main/java/org/openhab/binding/tcp/AbstractSocketChannelBinding.java
	distribution/openhabhome/configurations/openhab_default.cfg