Merge remote-tracking branch 'working/collab/bshum/mobile-cat-hacking' into fu
authorDan Scott <dscott@laurentian.ca>
Tue, 24 Sep 2013 13:16:48 +0000 (09:16 -0400)
committerDan Scott <dscott@laurentian.ca>
Tue, 24 Sep 2013 13:16:48 +0000 (09:16 -0400)

Trivial merge