4 commits

Author	SHA1	Message	Date
danielvincent	2e8bba1a04	MS DG adding more to exporter and importer	2010-10-12 11:34:13 -07:00
maxwell	0541833c18	stop the file include madness. using File.join and Rails.root for includes everywhere I could	2010-10-10 11:54:08 -07:00
Raphael	1fd3aeabd9	Add or later to license notice	2010-10-07 16:25:34 -07:00
danielvincent	7a3d168123	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-07 14:17:22 -07:00