git.itanic.dy.fi Git - rrdd/commit

author	Timo Kokkonen <timo.t.kokkonen@iki.fi>
	Thu, 21 Jun 2012 19:17:17 +0000 (22:17 +0300)
committer	Timo Kokkonen <timo.t.kokkonen@iki.fi>
	Thu, 21 Jun 2012 19:17:17 +0000 (22:17 +0300)
commit	48523ce34f456e741c50d1316389d983de83d7e0
tree	48763751cecdea7a8302c97291ac36d2b7ae095d	tree \| snapshot
parent	4ac025a8ad309e54f6c3ae817ac24f4cfeba1750	commit \| diff
parent	2ded96320848c7222fdd0e0a75f208495e8a0019	commit \| diff

Merge branch 'master' into itanic

Conflicts:
database.h

Signed-off-by: Timo Kokkonen <timo.t.kokkonen@iki.fi>