Merge from vendor branch TNF:
authortaca <taca>
Thu, 23 Sep 2010 07:27:35 +0000 (07:27 +0000)
committertaca <taca>
Thu, 23 Sep 2010 07:27:35 +0000 (07:27 +0000)
commit52e0814d68ee6d35412c69ed0263b18c24dff218
treec51b454ba81f919af6906dcba0064b5886c9ae1d
parenta195e807966cdfa856b2cae6793c928760b3519c
parent2744c81171a20f0fa22d52fbc64d64681b3491bf
Merge from vendor branch TNF:
Importing www/merb-admin 0.8.5.

MerbAdmin is a Merb plugin that provides an easy-to-use interface for
managing your data.  It currently offers the features listed
here: http://sferik.tadalist.com/lists/1352791/public.