From b673617734d3d2370c314d3b36412a3e7ded5a4c Mon Sep 17 00:00:00 2001
From: Michael Hierweck <michael.hierweck@hostsharing.net>
Date: Wed, 31 Oct 2012 14:23:53 +0100
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hsarweb/.gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/hsarweb/.gitignore b/hsarweb/.gitignore
index 796b96d..2f230b7 100644
--- a/hsarweb/.gitignore
+++ b/hsarweb/.gitignore
@@ -1 +1,2 @@
 /build
+/bin
\ No newline at end of file

--
Gitblit v1.9.1