Merge api06 branch to trunk.
authorTom Hughes <tom@compton.nu>
Mon, 20 Apr 2009 09:12:03 +0000 (09:12 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 20 Apr 2009 09:12:03 +0000 (09:12 +0000)
commitfd6f00b069af5a7b87227ea4c3401dc461d7311a
treeb1d17ee42b2403378b38cd669e4254e1d169b8c1
parent80c6c685bcf097754e872ba61444fc4bb93f2515
parente8c7543bdd5001a69491b8119e793d6c889fe468
Merge api06 branch to trunk.
app/controllers/amf_controller.rb
app/controllers/export_controller.rb
app/views/user/view.rhtml