[jenkinsci/perforce-plugin] 435187: Merge branch 'master' of https://github.com/miktap...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/jenkinsci/perforce-plugin
  Commit: 435187cbe5af110429bf924f6a93789401930aaa
      
https://github.com/jenkinsci/perforce-plugin/commit/435187cbe5af110429bf924f6a93789401930aaa
  Author: Rob Petti <rob.pe...@gmail.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M src/main/java/hudson/plugins/perforce/PerforceSCM.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/miktap/perforce-plugin into 
miktap-master

Conflicts:
        src/main/java/hudson/plugins/perforce/PerforceSCM.java