Merge branch 'master' of git://git.pcp.io/lberk/pcp into lberk-merge
commit2d003070645d402bd68f9454e71793adcdc160f4
authorNathan Scott <nathans@redhat.com>
Sun, 10 Jan 2016 22:42:21 +0000 (11 09:42 +1100)
committerNathan Scott <nathans@redhat.com>
Sun, 10 Jan 2016 22:42:21 +0000 (11 09:42 +1100)
tree95fbb3b75a50532beed253c72b8a425be72b75cb
parent16f4ae2b7265b5de665f173e0b551b036a3d103d
parent7ed99712b5aa90340006248078a09e66b3db1266
Merge branch 'master' of git://git.pcp.io/lberk/pcp into lberk-merge
build/rpm/fedora.spec
build/rpm/pcp.spec.in