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)
commitb4f7eae590bfea841db3099c4dba1160fb2f6d27
tree8569663dcc92c5cbe077f04e188e5c56b9c5c719
parent07b90b6e3b0f1346412493510fb878faf90c1cc1
parent600c10f4c2463ad7a09ce78d0067de5d0ec86a10
Merge github.com:SpamapS/templates

Conflicts:
generic-user.yaml