Merge branch 'jk/1.7.0-status' into pu
authorShawn O. Pearce <spearce@spearce.org>
Tue, 29 Sep 2009 17:51:14 +0000 (10:51 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Tue, 29 Sep 2009 17:51:14 +0000 (10:51 -0700)
commit01770be9aeb325921163e75868df5ae29553b353
treeedc8e5c20119907437d2a026a145d576854bcea8
parent102f4eb6806263e89c23c0bca13d657d1c65662f
parent46b77a6b487fceeeb297a9473631939aefd7e6fd
Merge branch 'jk/1.7.0-status' into pu

* jk/1.7.0-status:
  docs: note that status configuration affects only long format