tokkee.org

Code

projects / pkg-collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: af4f8b3 8c23781)

author	Sebastian Harl <sh@teamix.net>
	Fri, 3 Aug 2012 08:58:03 +0000 (08:58 +0000)
committer	Sebastian Harl <sh@teamix.net>
	Fri, 3 Aug 2012 08:58:03 +0000 (08:58 +0000)
commit	b2150ed966b02d1f3718ba35a6db261e50d484d1
tree	7947a8959870d19a9a657928ac4f8d206087bd99	tree \| snapshot
parent	af4f8b3601ea80bcb5c2e0875af0cbe89fd9a408	commit \| diff
parent	8c23781c7d9a77abbd2443208b0f73af5645bce4	commit \| diff

Merge branch 'master' into squeeze-backports.

Updated changelog to 5.1.0-3~bpo60+1.

Conflicts:
debian/changelog

debian/changelog

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