Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/irspy

Conflicts:
	zebra/zebra.cfg

diff --combined zebra/zebra.cfg
index f769105,0527644..7c7d482
--- 1/zebra/zebra.cfg
--- 2/zebra/zebra.cfg
+++ b/zebra/zebra.cfg
@@@ -1,11 -1,11 +1,11 @@@
  
  # Where to look for config files
- profilePath: .:/usr/local/share/idzebra-2.0/tab:/usr/share/idzebra-2.0/tab:/opt/local/share/idzebra-2.0/tab:/usr/share/idzebra-2.0/tab
+ profilePath: .:/usr/share/idzebra-2.0/tab:/opt/local/share/idzebra-2.0/tab:/usr/local/Cellar/zebra/2.0.59/share/idzebra-2.0/tab
  
  # Where to look for loadable zebra modules.  Both these path components
  # are necessary, since the former is used when installed from a Debian
  # package and the latter when installed from a Mac port.
 -modulePath: /usr/lib/idzebra-2.0/modules:/opt/local/lib/idzebra-2.0/modules:/usr/local/Cellar/zebra/2.0.59/lib/idzebra-2.0/modules
 +modulePath: /usr/local/lib/idzebra-2.0/modules:/opt/local/lib/idzebra-2.0/modules:/usr/lib/idzebra-2.0/modules
  
  # store records and record keys internally
  storeData: 1