tokkee.org

Code

projects / pkg-collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3ef53d0 43eaffd)

author	Marc Fournier <marc@bl.uem.li>
	Fri, 29 Jan 2016 13:54:15 +0000 (14:54 +0100)
committer	Marc Fournier <marc@bl.uem.li>
	Fri, 29 Jan 2016 13:54:15 +0000 (14:54 +0100)
commit	98b3724342bbb3cb35651c4409c7187150a6f813
tree	9158af5f49a13286a42b587aa815a801cdccdb7d	tree \| snapshot
parent	3ef53d0d929161c049bc06e5aadca5cc8ccb296e	commit \| diff
parent	43eaffdd5ad4aaf2333bc2085e55a09a7a3d80cd	commit \| diff

Merge branch 'master' into precise-ppa

debian/changelog	diff1 \|	diff2 \|	blob \| history
debian/rules	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.