Merge m-c to b2g-inbound.
commit2cd91393435a095dcabd4211f5ace20ae02ac1be
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 21 Nov 2013 16:38:18 +0000 (21 11:38 -0500)
committerRyan VanderMeulen <ryanvm@gmail.com>
Thu, 21 Nov 2013 16:38:18 +0000 (21 11:38 -0500)
treedc628c5512ac73c94a7602ffaf4f5a4007f8c382
parent910f83ff50d34b7fe1e74d80abfed3c61f823bf3
parentd18213092467cacb6bbf0f8005a1ced677c27ae6
Merge m-c to b2g-inbound.
configure.in
content/base/src/nsGkAtomList.h