David Anderson 4abf6b22ab Fix merge bustage.		2012-06-25 13:45:51 -07:00
..
android	Fix merge bustage.	2012-06-25 13:45:51 -07:00
locales	Bug 716478 - update licence to MPL 2.	2012-05-21 12:12:37 +01:00
xul	Bug 765106 - Use mobile video controls binding. r=gavin	2012-06-15 11:33:14 -07:00