<NME> VERSION
<BEF> 0.5.11

<MSG> Merge branch 'master' into gerrit_master

and bumping kafka to 0.5.12

Conflicts:
	cookbooks/kafka/VERSION

<DFF> @@ -1,1 +1,2 @@
-0.5.11
+0.5.12
+

{'commit': 'diff --git a/cookbooks/kafka/VERSION b/cookbooks/kafka/VERSION\nindex 69626fb9..949515a6 100644\n--- a/cookbooks/kafka/VERSION\n+++ b/cookbooks/kafka/VERSION\n@@ -1 +1,2 @@\n-0.5.11\n+0.5.12\n+\n', 'commit_subject': "Merge branch 'master' into gerrit_master", 'repo_name': 'infochimps-labs/ironfan-pantry', 'committer': {'name': 'Josh Bronson', 'email': 'dfbb1b651649858e0167a22dc7df7c2723e92538@gmail.com', 'time_sec': '1390415254', 'tz_offset': '-360', 'date': {'seconds': '1390415254'}}, 'commit_tree': 'b3c07ab14a978032f7c560e6d8017000bd299bb8', 'commit_message': "Merge branch 'master' into gerrit_master\n\nand bumping kafka to 0.5.12\n\nConflicts:\n\tcookbooks/kafka/VERSION\n", 'language_name': 'Shell', 'license': 'apache-2.0', 'hunks': '@@ -1,1 +1,2 @@\n-0.5.11\n+0.5.12\n+\n', 'addition_count': 2, 'deletion_count': 1, 'src_file': 'a/cookbooks/kafka/VERSION', 'tgt_file': 'b/cookbooks/kafka/VERSION', 'file_extension': '', 'before_file': '0.5.11\n', 'message': "Merge branch 'master' into gerrit_master\n\nand bumping kafka to 0.5.12\n\nConflicts:\n\tcookbooks/kafka/VERSION\n", 'author_name': 'Josh Bronson', 'lang': 'VERSION'}