fix merge conflicts

This commit is contained in:
Joe Thornber 2012-03-14 12:52:17 +00:00
commit aa437b124d

View File

@ -1 +1 @@
0.1.2+
0.1.3+