ankidroid/Anki-Android — pull request #32 by nicolas-raoul (2013-04-17 08:29:56+00:00)
Title: Multimedia editor

Finally found time to perform the merge :-)
I haven't looked at the changes that merged automatically, so the usual review would be appropriate.
Some changes are due to classes having been reformatted using Eclipse.