set trees by domain, not IP
Merge branch 'master' into xmpp
build rpm/deb from libertree-model gem
update name of dependencies for pg gem
commit id as version for gems from git
Merge branch 'master' into xmpp

Conflicts:
	Makefile
Merge branch 'master' into xmpp
relax nokogiri dependency

blather (used by the backend) depends on Nokogiri < 1.6
Merge remote-tracking branch 'origin/master' into xmpp

Conflicts:
	libertree-model.gemspec
Merge branch 'master' into xmpp
switch to mutex branch of M4DBI
Revert "switch to mutex branch of M4DBI"

This reverts commit 6300cf036cafcb38388ba47601e08df63ec85d3e.
update to m4dbi 0.9.0

This version secures handles against concurrent access.
Merge branch 'master' into xmpp
Merge branch 'master' into xmpp
Merge branch 'master' into xmpp

Conflicts:
	Gemfile.lock
Merge branch 'master' into xmpp
Merge branch 'master' into xmpp
Merge branch 'master' into xmpp
Merge branch 'master' into xmpp