pcp updates: dev->nssmerge

[Nathan Scott <nathans@xxxxxxxxxx>]

Changes committed to git://oss.sgi.com/pcp/pcp.git nssmerge

 qa/462     |    2 +-
 qa/462.out |   18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

commit c0e5b2b5728a803103af75c3f61681f1e4465f45
Merge: 04e13d3 1625d52
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date:   Wed Nov 21 21:07:52 2012 +1100

    Merge branch 'brolley/nssmerge' of git://sourceware.org/git/pcpfans into 
nssmerge

commit 1625d520f69e354a9633256f3c6f1429aff66273
Author: Dave Brolley <brolley@xxxxxxxxxx>
Date:   Tue Nov 20 10:58:27 2012 -0500

    qa test case 462. Filter all sequences of 3 or more periods as [dots].
    
    Adjust the expected output.

commit 04e13d38e3835d64ed2162c9639123239d2f98d9
Merge: ccd1b3c b011499
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date:   Wed Nov 21 21:05:14 2012 +1100

    Merge branch 'dev' into nssmerge