tree 865fc44d62f5a0bcdc80bb51dcdcb159d9001760
parent d47ca8a66df40e7c235cb760baa128841aba8bfe
parent b531819715d292af94d7f3a39e7f8379c6a8a3c1
author Shawn Pearce <sop@google.com> 1363899121 -0700
committer Shawn Pearce <sop@google.com> 1363899121 -0700

Merge branch 'stable-2.6'

* stable-2.6:
  Fix IllegalFormatConversionException in ReceiveCommits
  ReleaseNotes: Update link to gerrit-2.6.war