merge conflicts
authorsmita <smita@smita-laptop.(none)>
Thu, 2 Dec 2010 09:00:05 +0000 (11:00 +0200)
committersmita <smita@smita-laptop.(none)>
Thu, 2 Dec 2010 09:00:05 +0000 (11:00 +0200)
commita7c072044665c658aa3d1e69f8981624b040bb01
tree84f698900d149098e05af8d7a8181d938e2caa12
parent1d5299ea3f6c3a8f1ae86d5cfda76ec499f19f18
parent8e9db99f295fcd7cea7f404b89fdd1be8502ea86
merge conflicts
lib/AccountsUI/libAccountPlugin.css