Feature 1
Other Feature 1
Combination of commits

commit 48f400b8bfd1bfa1ab42cdab673bae56ed7bd3bd
Author: Martyn Gigg <martyn.gigg@gmail.com>
Date:   Sun Feb 17 09:49:19 2013 +0000

    Other Feature 1

commit d7731014da7ddc30265577d0c8ca2ae93f9c09fe
Author: Martyn Gigg <martyn.gigg@gmail.com>
Date:   Sun Feb 17 09:46:54 2013 +0000

    Feature 1
Merge branch 'feature/feature1' into integration
Fix feature 1
Merge branch 'feature/feature1' into integration
Merge branch 'integration'