Proper indentation of merged code
Proper indentation of merged code

greg/fb-mac-messenger,greg/fb-mac-messenger,greg/fb-mac-messenger,greg/fb-mac-messenger,greg/fb-mac-messenger,greg/fb-mac-messenger,greg/fb-mac-messenger