Branch merge.

FossilOrigin-Name: 314b9504a2bca796e18278fecbe12a6bc55d7ace9bfa4d06b0f9217d627af271
This commit is contained in:
mahlon@laika.com 2014-08-11 18:25:33 +00:00
commit d6d0a5f8b0
2 changed files with 5 additions and 1 deletions

View file

@ -6,4 +6,5 @@
27bbe75233a3da1482fededd7f67215bc716b2d5 1.0.0
0cc20d93ff50438fcb3fec864474b3cab492dd1a 1.0.1
94b64bbf93cfdfaf0ee68c54cd60bd85865fcb47 1.0.2
e1728adb2561a87a3ab10e57ae4b3140abf4b5cf 1.1.0
1a480ba231b6ef7714a08151434b7773a1851936 1.2.0