tokkee.org

Code

projects / pkg-collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ad7eeb7 2de9f5f)

author	Marc Fournier <marc@bl.uem.li>
	Thu, 5 Jan 2017 20:45:28 +0000 (21:45 +0100)
committer	Marc Fournier <marc@bl.uem.li>
	Thu, 5 Jan 2017 20:45:28 +0000 (21:45 +0100)
commit	848ea25d80fbbfb1991d3292809fed0a60afed27
tree	1fdc25c32c8c4d53968caccb3d8d877f3650b4f2	tree \| snapshot
parent	ad7eeb778e30709ffb3b84e7df8215a3bac91bae	commit \| diff
parent	2de9f5f705be51e44f94c67d16319baa6c7d40f6	commit \| diff

Merge branch 'master' into jessie-backports

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

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