Merge branch 'master' of github.com:lansz/pgbadger into lansz-master

author Darold Gilles <gilles@darold.net>

Fri, 11 Jul 2014 13:48:25 +0000 (15:48 +0200)

committer Darold Gilles <gilles@darold.net>

Fri, 11 Jul 2014 13:48:25 +0000 (15:48 +0200)
author Darold Gilles <gilles@darold.net>
Fri, 11 Jul 2014 13:48:25 +0000 (15:48 +0200)
committer Darold Gilles <gilles@darold.net>
Fri, 11 Jul 2014 13:48:25 +0000 (15:48 +0200)
diff --cc README
Simple merge
diff --cc pgbadger

index 56e4bbe80527467e408ac57862caefcdadcdb70d,f9a189b571e0816fa0ca1309973f20c6d98ee961..c327b38d6d52dc65231ec3d7b29888e8a4e49c3b

mode 100755,100644..100755
--- 1/pgbadger
--- 2/pgbadger
+++ b/pgbadger
author	Darold Gilles <gilles@darold.net>
	Fri, 11 Jul 2014 13:48:25 +0000 (15:48 +0200)
committer	Darold Gilles <gilles@darold.net>
	Fri, 11 Jul 2014 13:48:25 +0000 (15:48 +0200)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
pgbadger	patch \|	diff1 \|	diff2 \|	blob \| history