Merge github.com:SpamapS/templates
authorClint Byrum <clint@fewbar.com>
Wed, 8 May 2013 23:01:42 +0000 (23:01 +0000)
committerClint Byrum <clint@fewbar.com>
Wed, 8 May 2013 23:01:42 +0000 (23:01 +0000)
Conflicts:
generic-user.yaml


Trivial merge