fixing merge conflict #805 #841

Merged
merged 3 commits into from Jan 10, 2013

2 participants

@mollybostic

No description provided.

Patrick Flet... and others added some commits Dec 26, 2012
@scottturnbull scottturnbull merged commit a865341 into Azure:master Jan 10, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment