Added a
Added b
Changed a and b
Merge branch 'dev' into qa
a and b should reference each other
Added c
Added d
Updated c and d
Merge branch 'bugfix1' into dev
Added e
Added f
Updated e and f
Merge branch 'bugfix2' into dev
Added g
Updated g
Merge branch 'bugfix3' into dev
Merge branch 'dev' into qa
Merge branch 'qa'