From: Richard Whitehouse <github@richardwhiuk.com>
Date: Sun, 8 May 2011 00:49:18 +0000 (+0100)
Subject: Merge branch 'state'
X-Git-Url: https://git.richardwhiuk.com/?a=commitdiff_plain;h=aaa8bdb4fa32c8a4152ba3f9d29505aa9d06d29a;p=ns-moose.git

Merge branch 'state'
---

aaa8bdb4fa32c8a4152ba3f9d29505aa9d06d29a