From: Tom Hughes <tom@compton.nu>
Date: Wed, 10 May 2017 07:27:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pull/122'
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/6fdba5edc17c0ccbb5dc3bd15690dcba6708e1fe?hp=527bae9672f6bfdcbc2a69925c8fc4b7541e90ae

Merge remote-tracking branch 'github/pull/122'
---

diff --git a/cookbooks/supybot/templates/default/git.conf.erb b/cookbooks/supybot/templates/default/git.conf.erb
index 255b5a34f..6c451bf78 100644
--- a/cookbooks/supybot/templates/default/git.conf.erb
+++ b/cookbooks/supybot/templates/default/git.conf.erb
@@ -87,6 +87,30 @@ commit link = https://github.com/openstreetmap/osm2pgsql/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
+[osm-osm2pgsql-0.92.x]
+short name = osm-osm2pgsql-0.92.x
+url = git://github.com/openstreetmap/osm2pgsql.git
+branch = 0.92.x
+commit link = https://github.com/openstreetmap/osm2pgsql/commit/%c
+channels = #osm-dev
+commit message = [%s|%b|%a] %m %l
+
+[osm-osm2pgsql-0.90.x]
+short name = osm-osm2pgsql-0.90.x
+url = git://github.com/openstreetmap/osm2pgsql.git
+branch = 0.90.x
+commit link = https://github.com/openstreetmap/osm2pgsql/commit/%c
+channels = #osm-dev
+commit message = [%s|%b|%a] %m %l
+
+[osm-osm2pgsql-0.88.x]
+short name = osm-osm2pgsql-0.88.x
+url = git://github.com/openstreetmap/osm2pgsql.git
+branch = 0.88.x
+commit link = https://github.com/openstreetmap/osm2pgsql/commit/%c
+channels = #osm-dev
+commit message = [%s|%b|%a] %m %l
+
 [osm-mod_tile]
 short name = osm-mod_tile
 url = git://github.com/openstreetmap/mod_tile.git