Completing feature f
Merge branch 'feature_f' into development
Completing feature e
Adding test script
Merge branch 'test_script' into development
Merge branch 'development' into feature_e

Conflicts:
	app1/file1.txt
Merge remote-tracking branch 'origin/feature_e' into development
Revert "Merge branch 'feature_f' into development"

This reverts commit 5a442e7a599fb4c5109a90c6e48e92245b504555, reversing
changes made to 7ae67830cf9d4788896d80fb5f2ad5621283759f.

Conflicts:

	app1/file1.txt
Revert "Revert "Merge branch 'feature_f' into development""

This reverts commit 8f2433dbf6ecd23b2c500525ea320d816262b8fe.
fixing bug in file1.txt
Merge remote-tracking branch 'origin/feature_f' into development
Revert "Merge remote-tracking branch 'origin/feature_e' into development"

This reverts commit 4625951cb0864f3781a0c338fcaa0bc51378d4d0, reversing
changes made to 20742dc7e7a0c97f4d585bc146cef6ece97e8de8.
Revert "Revert "Merge remote-tracking branch 'origin/feature_e' into development""

This reverts commit a13a46e61b3c5353a37b49ab86c34b8a187266d8.
fixing bug
Merge remote-tracking branch 'origin/feature_e' into release_2013_04_18
Revert "Merge remote-tracking branch 'origin/feature_f' into development"

This reverts commit dc92929ca25ecdac61b3ff6ced39b67f904b8e5c, reversing
changes made to 8f2433dbf6ecd23b2c500525ea320d816262b8fe.
Merge remote-tracking branch 'origin/release_2013_04_18'