Ryan VanderMeulen 683b08ae37 Merge m-c to inbound. a=merge		2015-05-28 10:20:38 -04:00
..
base	Bug 1107883 - support ipv6 URLs in the awesomebar with unified autocomplete enabled. r=mak, r=smaug	2015-05-28 17:21:58 +10:00
build	Bug 1164706 - Flatten docshell/shistory/src/ directory. r=smaug	2015-05-15 15:25:39 -07:00
resources/content	Bug 1147212 - Add support for goog-unwanted-shavar. r=gcp,r=matej,r=smaug	2015-04-22 21:01:37 +12:00
shistory	Bug 1165515 - Part 1: Convert PR_LOG to MOZ_LOG. r=froydnj	2015-05-21 13:22:04 -07:00
test	Merge m-c to inbound. a=merge	2015-05-28 10:20:38 -04:00
moz.build	Bug 1141190 - Remove docshell/test/moz.build; r=mshal	2015-03-11 10:49:04 +01:00