4 Commits

Author	SHA1	Message	Date
kay.one	7ff1335a2e	fixed merge conflicts.	2013-07-04 21:09:32 -07:00
Mark McDowall	3f6a6d53d5	Media Management settings are alive	2013-07-04 20:26:07 -07:00
Mark McDowall	9a68785c26	Default separater will be " - " now	2013-05-30 21:07:18 -07:00
Keivan Beigi	4cd75cd8aa	stuff we did :D	2013-04-24 21:27:49 -07:00