Merge remote-tracking branch 'origin/gitweb'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 20 Aug 2014 09:08:38 +0000 (09:08 +0000)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 20 Aug 2014 09:08:38 +0000 (09:08 +0000)
commit47abcaaed1ca3c10773f4aa5cd9519ece0ad1508
treea94843e0c6e083d1d8892f827da06ab918d5556c
parente2fd38dcc7ec60dccd8db1847d0584d4a1661b8f
parent6979ee61890e2902d51b13b6f018baf4491ba382
Merge remote-tracking branch 'origin/gitweb'

Conflicts:
component/nginx/buildout.cfg
component/ruby/buildout.cfg
software/gitrepo/software.cfg
component/icu/buildout.cfg
component/ruby/buildout.cfg
software/gitrepo/software.cfg