SciLifeLab/bcbb — pull request #118 by vals (2012-03-15 09:13:52+00:00)
Title: Develop - Taking care if merge conflicts with Master

If we stay on this pattern:

Down: CentralDevelop -(pull)-> PersonalDevelop
Up: PersonalDevelop -(pull)-> CentralDevelop; CentralDevelop -(pull)-> CentralMaster

this should never happen.