From: Yves-Alexis Perez <corsac@debian.org>
Date: Tue, 15 May 2012 21:30:39 +0000 (+0200)
Subject: Merge tag '0.4.6' into upstream-unstable
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d26b1fb745a2ad0462491ecf23f4eb40ea3afd73;p=midori

Merge tag '0.4.6' into upstream-unstable

Bump version to 0.4.6

Conflicts:
	ChangeLog
	wscript
---

d26b1fb745a2ad0462491ecf23f4eb40ea3afd73