Merge branch 'master' of git://github.com/jachcemjest/obs-git
authorPavol Rusnak <stick@gk2.sk>
Fri, 10 Jul 2009 21:35:47 +0000 (23:35 +0200)
committerPavol Rusnak <stick@gk2.sk>
Fri, 10 Jul 2009 21:35:47 +0000 (23:35 +0200)
commita8b3d7bff510abd1ab5c9ea1bd31bc57603cc3c2
treea01b2cd39c558679cb3eba2b397b22c9bf3ea12a
parentf44029a7a6301de6a08056aad0862c23bb840d8e
parent7b0a0b505207024f87de6fb660773c290fc6540b
Merge branch 'master' of git://github.com/jachcemjest/obs-git

Conflicts:
bs_srcserver_gitonly
bs_srcserver_gitonly