From 7fad65d7af43414d744f4d5d1e75c0f181de9cf8 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 26 Mar 2012 03:38:19 -0400
Subject: [PATCH 1/2] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  add screenshots to diabook

* master:

From 0c4aba4b57c9aaab81a067bbe57c1f6ca59f2699 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 26 Mar 2012 03:39:06 -0400
Subject: [PATCH 2/2] [fix] contact_edit.tpl syntax; reduce cols to fit better

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/contact_edit.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100755 => 100644 view/contact_edit.tpl

diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl
old mode 100755
new mode 100644
index fc1a3d47b..417578a32
--- a/view/contact_edit.tpl
+++ b/view/contact_edit.tpl
@@ -63,7 +63,7 @@
 
 <div id="contact-edit-info-wrapper">
 <h4>$lbl_info1</h4>
-	<textarea id="contact-edit-info" rows=8 cols=72 name="info" >$info</textarea>
+	<textarea id="contact-edit-info" rows="8" cols="60" name="info">$info</textarea>
 	<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
 </div>
 <div id="contact-edit-info-end"></div>