# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1307913670 -3600
# Node ID 4dcdba6900f2a18fa60e68f638b16bc78ace0a06
# Parent  b46b766ce0af34e6aee3a2fa3ed805c768671d76# Parent  c3f39ccc7c50a2deaa8422e614754c63f6c090a2
Merge 0.8->trunk

diff -r b46b766ce0af -r 4dcdba6900f2 .hgtags
--- a/.hgtags	Sat Jun 11 02:17:11 2011 +0100
+++ b/.hgtags	Sun Jun 12 22:21:10 2011 +0100
@@ -44,3 +44,4 @@
 aa905291a66c7d8168b1cb912bb173e6478dac05 0.8.1
 aa905291a66c7d8168b1cb912bb173e6478dac05 0.8.1
 3421dfaa81880201e9ade8b4eee727ade9a9ce33 0.8.1
+44b131d7041ba40ff2cab6519d1543d33ff679a4 0.8.2