Merge branch '216_cwebber_style_unique_slugs'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 25 Jan 2013 18:03:40 +0000 (12:03 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 25 Jan 2013 18:03:40 +0000 (12:03 -0600)

Trivial merge