Merge branch 'prerelease'v2.1.0
commit2e2440c98abd8f9445a6eab1671e7cea7752ec6d
authorStephen Lombardo <sjlombardo@zetetic.net>
Fri, 7 Dec 2012 13:57:25 +0000 (7 08:57 -0500)
committerStephen Lombardo <sjlombardo@zetetic.net>
Fri, 7 Dec 2012 13:57:25 +0000 (7 08:57 -0500)
tree5a4c5afc558d31e2e67b4986b875cd813cbfc1b8
parentceee9961194e764a60210524a324eddd684555dc
parent37f48491cefb47f00c5ae608b4ac59604c60786d
Merge branch 'prerelease'