# This is a combination of 3 commits.
# The first commit's message is:
# This is a combination of 3 commits.
# The first commit's message is:
issue89: vagrant status is now displaying task_state if not null and otherwise vm_state

# This is the 2nd commit message:

clean code again

# This is the 3rd commit message:

pass rake

# This is the 2nd commit message:

clean code again

# This is the 3rd commit message:

pass rake
issue89: vagrant status is now displaying task_state if not null and otherwise vm_state

Conflicts:
	source/locales/en.yml