Merge branch 'master' of file:////home/macgirvin/dev

Conflicts:
	boot.php

48 files changed, 0 insertions, 0 deletions

diff --git a/view/theme/diabook/ch_directory_item.tpl b/view/theme/diabook/ch_directory_item.tpl
index db1936e4b..db1936e4b 100755..100644
--- a/view/theme/diabook/ch_directory_item.tpl
+++ b/view/theme/diabook/ch_directory_item.tpl
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
index caefed3b3..caefed3b3 100755..100644
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
diff --git a/view/theme/diabook/contact_template.tpl b/view/theme/diabook/contact_template.tpl
index 48930b48a..48930b48a 100755..100644
--- a/view/theme/diabook/contact_template.tpl
+++ b/view/theme/diabook/contact_template.tpl
diff --git a/view/theme/diabook/diabook-aerith/icons/block.png b/view/theme/diabook/diabook-aerith/icons/block.png
index a0b1dffe9..a0b1dffe9 100755..100644
--- a/view/theme/diabook/diabook-aerith/icons/block.png
+++ b/view/theme/diabook/diabook-aerith/icons/block.png
diff --git a/view/theme/diabook/diabook-blue/icons/block.png b/view/theme/diabook/diabook-blue/icons/block.png
index a0b1dffe9..a0b1dffe9 100755..100644
--- a/view/theme/diabook/diabook-blue/icons/block.png
+++ b/view/theme/diabook/diabook-blue/icons/block.png
diff --git a/view/theme/diabook/diabook-dark/icons/block.png b/view/theme/diabook/diabook-dark/icons/block.png
index a0b1dffe9..a0b1dffe9 100755..100644
--- a/view/theme/diabook/diabook-dark/icons/block.png
+++ b/view/theme/diabook/diabook-dark/icons/block.png
diff --git a/view/theme/diabook/diabook-green/icons/block.png b/view/theme/diabook/diabook-green/icons/block.png
index a0b1dffe9..a0b1dffe9 100755..100644
--- a/view/theme/diabook/diabook-green/icons/block.png
+++ b/view/theme/diabook/diabook-green/icons/block.png
diff --git a/view/theme/diabook/diabook-green/icons/notifications3.png b/view/theme/diabook/diabook-green/icons/notifications3.png
index 2c9c791c0..2c9c791c0 100755..100644
--- a/view/theme/diabook/diabook-green/icons/notifications3.png
+++ b/view/theme/diabook/diabook-green/icons/notifications3.png
diff --git a/view/theme/diabook/diabook-green/icons/notify3.png b/view/theme/diabook/diabook-green/icons/notify3.png
index 9b852d05b..9b852d05b 100755..100644
--- a/view/theme/diabook/diabook-green/icons/notify3.png
+++ b/view/theme/diabook/diabook-green/icons/notify3.png
diff --git a/view/theme/diabook/diabook-pink/icons/block.png b/view/theme/diabook/diabook-pink/icons/block.png
index a0b1dffe9..a0b1dffe9 100755..100644
--- a/view/theme/diabook/diabook-pink/icons/block.png
+++ b/view/theme/diabook/diabook-pink/icons/block.png
diff --git a/view/theme/diabook/diabook-pink/icons/notifications3.png b/view/theme/diabook/diabook-pink/icons/notifications3.png
index 2c9c791c0..2c9c791c0 100755..100644
--- a/view/theme/diabook/diabook-pink/icons/notifications3.png
+++ b/view/theme/diabook/diabook-pink/icons/notifications3.png
diff --git a/view/theme/diabook/diabook-pink/icons/notify3.png b/view/theme/diabook/diabook-pink/icons/notify3.png
index 9b852d05b..9b852d05b 100755..100644
--- a/view/theme/diabook/diabook-pink/icons/notify3.png
+++ b/view/theme/diabook/diabook-pink/icons/notify3.png
diff --git a/view/theme/diabook/diabook-red/icons/block.png b/view/theme/diabook/diabook-red/icons/block.png
index a0b1dffe9..a0b1dffe9 100755..100644
--- a/view/theme/diabook/diabook-red/icons/block.png
+++ b/view/theme/diabook/diabook-red/icons/block.png
diff --git a/view/theme/diabook/directory_item.tpl b/view/theme/diabook/directory_item.tpl
index 70d197955..70d197955 100755..100644
--- a/view/theme/diabook/directory_item.tpl
+++ b/view/theme/diabook/directory_item.tpl
diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl
index ce4b25fbf..ce4b25fbf 100755..100644
--- a/view/theme/diabook/group_side.tpl
+++ b/view/theme/diabook/group_side.tpl
diff --git a/view/theme/diabook/icons/attach.png b/view/theme/diabook/icons/attach.png
index 1958041cf..1958041cf 100755..100644
--- a/view/theme/diabook/icons/attach.png
+++ b/view/theme/diabook/icons/attach.png
diff --git a/view/theme/diabook/icons/audio.png b/view/theme/diabook/icons/audio.png
index 8d779a409..8d779a409 100755..100644
--- a/view/theme/diabook/icons/audio.png
+++ b/view/theme/diabook/icons/audio.png
diff --git a/view/theme/diabook/icons/block.png b/view/theme/diabook/icons/block.png
index a0b1dffe9..a0b1dffe9 100755..100644
--- a/view/theme/diabook/icons/block.png
+++ b/view/theme/diabook/icons/block.png
diff --git a/view/theme/diabook/icons/camera.png b/view/theme/diabook/icons/camera.png
index a5c7f1236..a5c7f1236 100755..100644
--- a/view/theme/diabook/icons/camera.png
+++ b/view/theme/diabook/icons/camera.png
diff --git a/view/theme/diabook/icons/close_box.png b/view/theme/diabook/icons/close_box.png
index 28e2675b8..28e2675b8 100755..100644
--- a/view/theme/diabook/icons/close_box.png
+++ b/view/theme/diabook/icons/close_box.png
diff --git a/view/theme/diabook/icons/contacts2.png b/view/theme/diabook/icons/contacts2.png
index 7817279f4..7817279f4 100755..100644
--- a/view/theme/diabook/icons/contacts2.png
+++ b/view/theme/diabook/icons/contacts2.png
diff --git a/view/theme/diabook/icons/drop.png b/view/theme/diabook/icons/drop.png
index 2abb82ef2..2abb82ef2 100755..100644
--- a/view/theme/diabook/icons/drop.png
+++ b/view/theme/diabook/icons/drop.png
diff --git a/view/theme/diabook/icons/expand.png b/view/theme/diabook/icons/expand.png
index a46e88ea5..a46e88ea5 100755..100644
--- a/view/theme/diabook/icons/expand.png
+++ b/view/theme/diabook/icons/expand.png
diff --git a/view/theme/diabook/icons/file_as.png b/view/theme/diabook/icons/file_as.png
index 16713fa53..16713fa53 100755..100644
--- a/view/theme/diabook/icons/file_as.png
+++ b/view/theme/diabook/icons/file_as.png
diff --git a/view/theme/diabook/icons/link.png b/view/theme/diabook/icons/link.png
index 0ef666a67..0ef666a67 100755..100644
--- a/view/theme/diabook/icons/link.png
+++ b/view/theme/diabook/icons/link.png
diff --git a/view/theme/diabook/icons/lock.png b/view/theme/diabook/icons/lock.png
index 7e34bf279..7e34bf279 100755..100644
--- a/view/theme/diabook/icons/lock.png
+++ b/view/theme/diabook/icons/lock.png
diff --git a/view/theme/diabook/icons/lupe.png b/view/theme/diabook/icons/lupe.png
index f8b228347..f8b228347 100755..100644
--- a/view/theme/diabook/icons/lupe.png
+++ b/view/theme/diabook/icons/lupe.png
diff --git a/view/theme/diabook/icons/next.png b/view/theme/diabook/icons/next.png
index 7b5e25b90..7b5e25b90 100755..100644
--- a/view/theme/diabook/icons/next.png
+++ b/view/theme/diabook/icons/next.png
diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png
index 347f1519e..347f1519e 100755..100644
--- a/view/theme/diabook/icons/notifications.png
+++ b/view/theme/diabook/icons/notifications.png
diff --git a/view/theme/diabook/icons/notifications3.png b/view/theme/diabook/icons/notifications3.png
index 2c9c791c0..2c9c791c0 100755..100644
--- a/view/theme/diabook/icons/notifications3.png
+++ b/view/theme/diabook/icons/notifications3.png
diff --git a/view/theme/diabook/icons/notify.png b/view/theme/diabook/icons/notify.png
index 355abb1eb..355abb1eb 100755..100644
--- a/view/theme/diabook/icons/notify.png
+++ b/view/theme/diabook/icons/notify.png
diff --git a/view/theme/diabook/icons/notify3.png b/view/theme/diabook/icons/notify3.png
index 9b852d05b..9b852d05b 100755..100644
--- a/view/theme/diabook/icons/notify3.png
+++ b/view/theme/diabook/icons/notify3.png
diff --git a/view/theme/diabook/icons/pencil.png b/view/theme/diabook/icons/pencil.png
index 772e49b17..772e49b17 100755..100644
--- a/view/theme/diabook/icons/pencil.png
+++ b/view/theme/diabook/icons/pencil.png
diff --git a/view/theme/diabook/icons/prev.png b/view/theme/diabook/icons/prev.png
index 55c1464ba..55c1464ba 100755..100644
--- a/view/theme/diabook/icons/prev.png
+++ b/view/theme/diabook/icons/prev.png
diff --git a/view/theme/diabook/icons/recycle.png b/view/theme/diabook/icons/recycle.png
index c3b8d2bf4..c3b8d2bf4 100755..100644
--- a/view/theme/diabook/icons/recycle.png
+++ b/view/theme/diabook/icons/recycle.png
diff --git a/view/theme/diabook/icons/remote.png b/view/theme/diabook/icons/remote.png
index a560cc55e..a560cc55e 100755..100644
--- a/view/theme/diabook/icons/remote.png
+++ b/view/theme/diabook/icons/remote.png
diff --git a/view/theme/diabook/icons/scroll_top.png b/view/theme/diabook/icons/scroll_top.png
index 0e7f7ae6a..0e7f7ae6a 100755..100644
--- a/view/theme/diabook/icons/scroll_top.png
+++ b/view/theme/diabook/icons/scroll_top.png
diff --git a/view/theme/diabook/icons/star.png b/view/theme/diabook/icons/star.png
index 0b00cb189..0b00cb189 100755..100644
--- a/view/theme/diabook/icons/star.png
+++ b/view/theme/diabook/icons/star.png
diff --git a/view/theme/diabook/icons/starred.png b/view/theme/diabook/icons/starred.png
index 2b82dfca3..2b82dfca3 100755..100644
--- a/view/theme/diabook/icons/starred.png
+++ b/view/theme/diabook/icons/starred.png
diff --git a/view/theme/diabook/icons/tagged.png b/view/theme/diabook/icons/tagged.png
index 144649ef8..144649ef8 100755..100644
--- a/view/theme/diabook/icons/tagged.png
+++ b/view/theme/diabook/icons/tagged.png
diff --git a/view/theme/diabook/icons/unlock.png b/view/theme/diabook/icons/unlock.png
index a0cda0ae5..a0cda0ae5 100755..100644
--- a/view/theme/diabook/icons/unlock.png
+++ b/view/theme/diabook/icons/unlock.png
diff --git a/view/theme/diabook/icons/unstarred.png b/view/theme/diabook/icons/unstarred.png
index ba3183f5c..ba3183f5c 100755..100644
--- a/view/theme/diabook/icons/unstarred.png
+++ b/view/theme/diabook/icons/unstarred.png
diff --git a/view/theme/diabook/icons/video.png b/view/theme/diabook/icons/video.png
index a03d1d818..a03d1d818 100755..100644
--- a/view/theme/diabook/icons/video.png
+++ b/view/theme/diabook/icons/video.png
diff --git a/view/theme/diabook/icons/weblink.png b/view/theme/diabook/icons/weblink.png
index 216e78344..216e78344 100755..100644
--- a/view/theme/diabook/icons/weblink.png
+++ b/view/theme/diabook/icons/weblink.png
diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl
index 1d94cb6d3..1d94cb6d3 100755..100644
--- a/view/theme/diabook/jot.tpl
+++ b/view/theme/diabook/jot.tpl
diff --git a/view/theme/diabook/mail_conv.tpl b/view/theme/diabook/mail_conv.tpl
index 989f17878..989f17878 100755..100644
--- a/view/theme/diabook/mail_conv.tpl
+++ b/view/theme/diabook/mail_conv.tpl
diff --git a/view/theme/diabook/search_item.tpl b/view/theme/diabook/search_item.tpl
index 123834064..123834064 100755..100644
--- a/view/theme/diabook/search_item.tpl
+++ b/view/theme/diabook/search_item.tpl
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 53048df6c..53048df6c 100755..100644
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php