Wes Kocher 08ffd204f8 Merge inbound to central, a=merge CLOSED TREE		2015-09-22 16:42:03 -07:00
..
content	Merge inbound to central, a=merge CLOSED TREE	2015-09-22 16:42:03 -07:00
jar.mn	Backed out changesets b2c46fdeca8b, 6b768986595f, and 78c891ba5de1 (bug 1089695) for frequent Marionette crashes.	2015-08-31 22:03:20 -04:00
moz.build	Bug 1191520: Fix build config error so the search settings footer is actually hidden. r=glandium	2015-08-20 08:39:20 -07:00