Merge branch 'jgoodman-fix_category_table'
authorIvan Kohler <ivan@freeside.biz>
Sat, 17 Jan 2015 02:38:17 +0000 (18:38 -0800)
committerIvan Kohler <ivan@freeside.biz>
Sat, 17 Jan 2015 02:38:17 +0000 (18:38 -0800)

Trivial merge