Merge branch '0.5.x' into 0.6.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 27 Apr 2012 17:57:43 +0000 (13:57 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 27 Apr 2012 17:57:43 +0000 (13:57 -0400)
commit655b1b0cc24ac4b1d6cbc131be48b0199c0c51ee
treefe2a32df50f011fcf1f68a8eabc6ca7f36671ece
parentdd02f3ca6e0a8ab1771887f5a49d3359a4d94d4d
parent824e8dde8b20854b9f0e25aa93dd4ae8c06e3877
Merge branch '0.5.x' into 0.6.0.x

Conflicts:
contrib/gitian-descriptors/gitian-win32.yml