Merge remote branch 'origin/master'
authorPavel Sher <pavel.sher@gmail.com>
Fri, 2 Mar 2012 11:23:43 +0000 (12:23 +0100)
committerPavel Sher <pavel.sher@gmail.com>
Fri, 2 Mar 2012 11:23:43 +0000 (12:23 +0100)
Conflicts:
git-server/src/jetbrains/buildServer/buildTriggers/vcs/git/GitVcsSupport.java


Trivial merge