merge
authorTero Marttila <terom@fixme.fi>
Wed, 07 Mar 2012 21:39:07 +0200
changeset 150 6e83183e242f
parent 148 278cdecf0191 (diff)
parent 149 5e8279dec643 (current diff)
merge
--- a/.hgtags	Wed Mar 07 21:38:19 2012 +0200
+++ b/.hgtags	Wed Mar 07 21:39:07 2012 +0200
@@ -1,1 +1,2 @@
 df859bfdd3be4c5047b2385b0f31b3d058319f9b 0.1.0-rc1
+35c4c56f1376587a11bd46f5259f030f03e9876e 0.2.0-rc1