From: Alexander Kampmann <programmer@nurfuerspam.de>
Date: Thu, 5 Apr 2012 11:39:15 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=355c42cb309eb1313097411067ca999b699aa620;p=friendica.git

Merge branch 'master' of https://github.com/friendica/friendica

Conflicts:
	include/config.php
	update.php
---

355c42cb309eb1313097411067ca999b699aa620
diff --cc .gitignore
index 2531fe4cdd,2531fe4cdd..2531fe4cdd
mode 100755,100755..100644
--- a/.gitignore
+++ b/.gitignore
diff --cc .htaccess
index 6cb3a07494,6cb3a07494..6cb3a07494
mode 100755,100755..100644
--- a/.htaccess
+++ b/.htaccess
diff --cc INSTALL.txt
index 574e90975b,574e90975b..574e90975b
mode 100755,100755..100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
diff --cc LICENSE
index 15c3e825b6,15c3e825b6..15c3e825b6
mode 100755,100755..100644
--- a/LICENSE
+++ b/LICENSE
diff --cc boot.php
index 56548160da,c0aa9ba82a..680ebde55c
mode 100644,100755..100644
--- a/boot.php
+++ b/boot.php
@@@ -9,9 -9,9 +9,9 @@@ require_once('include/nav.php')
  require_once('include/cache.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
- define ( 'FRIENDICA_VERSION',      '2.3.1288' );
+ define ( 'FRIENDICA_VERSION',      '2.3.1302' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
--define ( 'DB_UPDATE_VERSION',      1134      );
++define ( 'DB_UPDATE_VERSION',      1135      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
diff --cc database.sql
index a039746e8e,a271e5491c..010c63bb24
mode 100644,100755..100644
--- a/database.sql
+++ b/database.sql
diff --cc doc/Account-Basics.md
index 164a6be462,164a6be462..164a6be462
mode 100755,100755..100644
--- a/doc/Account-Basics.md
+++ b/doc/Account-Basics.md
diff --cc doc/Bugs-and-Issues.md
index 46abea9a3e,46abea9a3e..46abea9a3e
mode 100755,100755..100644
--- a/doc/Bugs-and-Issues.md
+++ b/doc/Bugs-and-Issues.md
diff --cc doc/Connectors.md
index 08b4c135e6,08b4c135e6..08b4c135e6
mode 100755,100755..100644
--- a/doc/Connectors.md
+++ b/doc/Connectors.md
diff --cc doc/Developers.md
index 17aff38697,17aff38697..17aff38697
mode 100755,100755..100644
--- a/doc/Developers.md
+++ b/doc/Developers.md
diff --cc doc/Home.md
index 56abe8075c,30efc93f7d..30efc93f7d
mode 100755,100755..100644
--- a/doc/Home.md
+++ b/doc/Home.md
diff --cc doc/Install.md
index 9455c62ba2,9455c62ba2..9455c62ba2
mode 100755,100755..100644
--- a/doc/Install.md
+++ b/doc/Install.md
diff --cc doc/Installing-Connectors.md
index 328e3b6c48,328e3b6c48..328e3b6c48
mode 100755,100755..100644
--- a/doc/Installing-Connectors.md
+++ b/doc/Installing-Connectors.md
diff --cc doc/Making-Friends.md
index 3f1a24c8de,3f1a24c8de..3f1a24c8de
mode 100755,100755..100644
--- a/doc/Making-Friends.md
+++ b/doc/Making-Friends.md
diff --cc doc/Message-Flow.md
index bb1c063d33,bb1c063d33..bb1c063d33
mode 100755,100755..100644
--- a/doc/Message-Flow.md
+++ b/doc/Message-Flow.md
diff --cc doc/Pages.md
index d0e6776a4b,d0e6776a4b..d0e6776a4b
mode 100755,100755..100644
--- a/doc/Pages.md
+++ b/doc/Pages.md
diff --cc doc/Plugins.md
index 29dff3187b,29dff3187b..29dff3187b
mode 100755,100755..100644
--- a/doc/Plugins.md
+++ b/doc/Plugins.md
diff --cc doc/Profiles.md
index 716db908e2,716db908e2..716db908e2
mode 100755,100755..100644
--- a/doc/Profiles.md
+++ b/doc/Profiles.md
diff --cc doc/Remove-Account.md
index ae5de2cb65,ae5de2cb65..ae5de2cb65
mode 100755,100755..100644
--- a/doc/Remove-Account.md
+++ b/doc/Remove-Account.md
diff --cc doc/Settings.md
index 9808ecc5d9,9808ecc5d9..9808ecc5d9
mode 100755,100755..100644
--- a/doc/Settings.md
+++ b/doc/Settings.md
diff --cc doc/Tags-and-Mentions.md
index ce4e45f42f,ce4e45f42f..ce4e45f42f
mode 100755,100755..100644
--- a/doc/Tags-and-Mentions.md
+++ b/doc/Tags-and-Mentions.md
diff --cc htconfig.php
index 9d9c8a2c79,9d9c8a2c79..9d9c8a2c79
mode 100755,100755..100644
--- a/htconfig.php
+++ b/htconfig.php
diff --cc images/article.gif
index 91aeef000b,91aeef000b..91aeef000b
mode 100755,100755..100644
Binary files differ
diff --cc images/audio.gif
index 4be9771161,4be9771161..4be9771161
mode 100755,100755..100644
Binary files differ
diff --cc images/b_block.gif
index 3bc7c056b5,3bc7c056b5..3bc7c056b5
mode 100755,100755..100644
Binary files differ
diff --cc images/b_drop.gif
index b08c68b62d,b08c68b62d..b08c68b62d
mode 100755,100755..100644
Binary files differ
diff --cc images/b_drop.png
index 6fc4d3b203,6fc4d3b203..6fc4d3b203
mode 100755,100755..100644
Binary files differ
diff --cc images/b_drophide.gif
index 1207a935bb,1207a935bb..1207a935bb
mode 100755,100755..100644
Binary files differ
diff --cc images/b_dropshow.gif
index b08c68b62d,b08c68b62d..b08c68b62d
mode 100755,100755..100644
Binary files differ
diff --cc images/b_edit.gif
index 79cb3c1444,79cb3c1444..79cb3c1444
mode 100755,100755..100644
Binary files differ
diff --cc images/b_edit.png
index 05711a0948,05711a0948..05711a0948
mode 100755,100755..100644
Binary files differ
diff --cc images/calendar.png
index fbf52933de,fbf52933de..fbf52933de
mode 100755,100755..100644
Binary files differ
diff --cc images/camera-icon.gif
index a4adf9adfa,a4adf9adfa..a4adf9adfa
mode 100755,100755..100644
Binary files differ
diff --cc images/connect-bg.png
index 0611c73e56,0611c73e56..0611c73e56
mode 100755,100755..100644
Binary files differ
diff --cc images/content-types.png
index e46eba610f,e46eba610f..e46eba610f
mode 100755,100755..100644
Binary files differ
diff --cc images/default-group-mm.png
index bfc8b335a7,bfc8b335a7..bfc8b335a7
mode 100755,100755..100644
Binary files differ
diff --cc images/default-profile-mm.jpg
index 79c1a85304,79c1a85304..79c1a85304
mode 100755,100755..100644
Binary files differ
diff --cc images/default-profile-sm.jpg
index 348957fb4f,348957fb4f..348957fb4f
mode 100755,100755..100644
Binary files differ
diff --cc images/default-profile.jpg
index 85fbca8cd7,85fbca8cd7..85fbca8cd7
mode 100755,100755..100644
Binary files differ
diff --cc images/diaspora.png
index 725fae7181,725fae7181..725fae7181
mode 100755,100755..100644
Binary files differ
diff --cc images/dislike.gif
index 77779423c8,77779423c8..77779423c8
mode 100755,100755..100644
Binary files differ
diff --cc images/document.gif
index 02d9409681,02d9409681..02d9409681
mode 100755,100755..100644
Binary files differ
diff --cc images/ff-128.jpg
index eaa0a7e67a,eaa0a7e67a..eaa0a7e67a
mode 100755,100755..100644
Binary files differ
diff --cc images/ff-16.jpg
index 3621f59148,3621f59148..3621f59148
mode 100755,100755..100644
Binary files differ
diff --cc images/ff-256.jpg
index f80ba07f80,f80ba07f80..f80ba07f80
mode 100755,100755..100644
Binary files differ
diff --cc images/ff-32.jpg
index 7f30999162,7f30999162..7f30999162
mode 100755,100755..100644
Binary files differ
diff --cc images/ff-64.jpg
index b9cecf7c52,b9cecf7c52..b9cecf7c52
mode 100755,100755..100644
Binary files differ
diff --cc images/ff.xcf
index a154256692,a154256692..a154256692
mode 100755,100755..100644
Binary files differ
diff --cc images/friendica-128.jpg
index f7d86ae50d,f7d86ae50d..f7d86ae50d
mode 100755,100755..100644
Binary files differ
diff --cc images/friendica-128.png
index d2792ab54e,d2792ab54e..d2792ab54e
mode 100755,100755..100644
Binary files differ
diff --cc images/friendica-16.jpg
index ce59a70a01,ce59a70a01..ce59a70a01
mode 100755,100755..100644
Binary files differ
diff --cc images/friendica-16.png
index 745b7ac6c5,745b7ac6c5..745b7ac6c5
mode 100755,100755..100644
Binary files differ
diff --cc images/friendica-1600.png
index 615a81dd94,615a81dd94..615a81dd94
mode 100755,100755..100644
Binary files differ
diff --cc images/friendica-256.jpg
index 182810d625,182810d625..182810d625
mode 100755,100755..100644
Binary files differ
diff --cc images/friendica-256.png
index e965fbabab,e965fbabab..e965fbabab
mode 100755,100755..100644
Binary files differ
diff --cc images/friendica-32.jpg
index 4e697411d6,4e697411d6..4e697411d6
mode 100755,100755..100644
Binary files differ
diff --cc images/friendica-32.png
index 61764bf20a,61764bf20a..61764bf20a
mode 100755,100755..100644
Binary files differ
diff --cc images/friendica-48.png
index f858d9a81a,f858d9a81a..f858d9a81a
mode 100755,100755..100644
Binary files differ
diff --cc images/friendica-64.jpg
index 050830fff9,050830fff9..050830fff9
mode 100755,100755..100644
Binary files differ
diff --cc images/friendica-64.png
index 88cb8b016d,88cb8b016d..88cb8b016d
mode 100755,100755..100644
Binary files differ
diff --cc images/friendica-96.png
index 76a102ef2e,76a102ef2e..76a102ef2e
mode 100755,100755..100644
Binary files differ
diff --cc images/friendica.svg
index 2105ef3175,2105ef3175..2105ef3175
mode 100755,100755..100644
--- a/images/friendica.svg
+++ b/images/friendica.svg
diff --cc images/friendika-128.jpg
index f7d86ae50d,f7d86ae50d..f7d86ae50d
mode 100755,100755..100644
Binary files differ
diff --cc images/friendika-128.png
index d2792ab54e,d2792ab54e..d2792ab54e
mode 100755,100755..100644
Binary files differ
diff --cc images/friendika-16.jpg
index ce59a70a01,ce59a70a01..ce59a70a01
mode 100755,100755..100644
Binary files differ
diff --cc images/friendika-16.png
index 745b7ac6c5,745b7ac6c5..745b7ac6c5
mode 100755,100755..100644
Binary files differ
diff --cc images/friendika-1600.png
index 615a81dd94,615a81dd94..615a81dd94
mode 100755,100755..100644
Binary files differ
diff --cc images/friendika-256.jpg
index 182810d625,182810d625..182810d625
mode 100755,100755..100644
Binary files differ
diff --cc images/friendika-256.png
index e965fbabab,e965fbabab..e965fbabab
mode 100755,100755..100644
Binary files differ
diff --cc images/friendika-32.jpg
index 4e697411d6,4e697411d6..4e697411d6
mode 100755,100755..100644
Binary files differ
diff --cc images/friendika-32.png
index 61764bf20a,61764bf20a..61764bf20a
mode 100755,100755..100644
Binary files differ
diff --cc images/friendika-48.png
index f858d9a81a,f858d9a81a..f858d9a81a
mode 100755,100755..100644
Binary files differ
diff --cc images/friendika-64.jpg
index 050830fff9,050830fff9..050830fff9
mode 100755,100755..100644
Binary files differ
diff --cc images/friendika-64.png
index 88cb8b016d,88cb8b016d..88cb8b016d
mode 100755,100755..100644
Binary files differ
diff --cc images/friendika-96.png
index 76a102ef2e,76a102ef2e..76a102ef2e
mode 100755,100755..100644
Binary files differ
diff --cc images/friendika.svg
index 2155d0b006,2155d0b006..2155d0b006
mode 100755,100755..100644
--- a/images/friendika.svg
+++ b/images/friendika.svg
diff --cc images/globe.gif
index 3f17c5d322,3f17c5d322..3f17c5d322
mode 100755,100755..100644
Binary files differ
diff --cc images/hide_off.png
index d504ca2e28,d504ca2e28..d504ca2e28
mode 100755,100755..100644
Binary files differ
diff --cc images/hide_on.png
index 960744c060,960744c060..960744c060
mode 100755,100755..100644
Binary files differ
diff --cc images/icons.png
index dd3af3aee3,dd3af3aee3..dd3af3aee3
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/10/add.png
index 296e8e500f,296e8e500f..296e8e500f
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/10/delete.png
index e4bd859338,e4bd859338..e4bd859338
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/10/edit.png
index d939342a10,d939342a10..d939342a10
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/10/feed.png
index 22aa5fd4b2,22aa5fd4b2..22aa5fd4b2
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/10/gear.png
index b1f2a8f521,b1f2a8f521..b1f2a8f521
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/10/group.png
index a58d51910c,a58d51910c..a58d51910c
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/10/info.png
index 667c127c65,667c127c65..667c127c65
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/10/link.png
index 0619f4511b,0619f4511b..0619f4511b
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/10/lock.png
index 2ddf98d081,2ddf98d081..2ddf98d081
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/10/menu.png
index 7dbb779d0b,7dbb779d0b..7dbb779d0b
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/10/notice.png
index 88ea4ac76a,88ea4ac76a..88ea4ac76a
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/10/notify_off.png
index 8ba240e1d2,8ba240e1d2..8ba240e1d2
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/10/notify_on.png
index d4ef715588,d4ef715588..d4ef715588
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/10/play.png
index a9f99e4d18,a9f99e4d18..a9f99e4d18
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/10/plugin.png
index 6cfc407864,6cfc407864..6cfc407864
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/10/star.png
index cd8518a18f,cd8518a18f..cd8518a18f
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/10/unlock.png
index d18088416b,d18088416b..d18088416b
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/10/user.png
index 6c2d161e87,6c2d161e87..6c2d161e87
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/16/add.png
index 1ff064bb30,1ff064bb30..1ff064bb30
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/16/delete.png
index 5323468605,5323468605..5323468605
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/16/edit.png
index bd845a7678,bd845a7678..bd845a7678
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/16/feed.png
index 082e1bc731,082e1bc731..082e1bc731
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/16/gear.png
index 86cbe1eb87,86cbe1eb87..86cbe1eb87
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/16/group.png
index 29ef69672d,29ef69672d..29ef69672d
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/16/info.png
index e8e7b35ba3,e8e7b35ba3..e8e7b35ba3
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/16/link.png
index afec9cc300,afec9cc300..afec9cc300
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/16/lock.png
index 189bfd29e1,189bfd29e1..189bfd29e1
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/16/menu.png
index a6b1cac47c,a6b1cac47c..a6b1cac47c
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/16/notice.png
index 13c5c6b79e,13c5c6b79e..13c5c6b79e
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/16/notify_off.png
index 3031fc906b,3031fc906b..3031fc906b
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/16/notify_on.png
index 1da6245a64,1da6245a64..1da6245a64
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/16/play.png
index 19ad05bf2e,19ad05bf2e..19ad05bf2e
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/16/plugin.png
index b11d920821,b11d920821..b11d920821
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/16/star.png
index ac620c43ce,ac620c43ce..ac620c43ce
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/16/unlock.png
index c56495d020,c56495d020..c56495d020
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/16/user.png
index 95c42c5725,95c42c5725..95c42c5725
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/22/add.png
index 2079e725d2,2079e725d2..2079e725d2
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/22/delete.png
index d0f2acf138,d0f2acf138..d0f2acf138
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/22/edit.png
index ad251b8ed0,ad251b8ed0..ad251b8ed0
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/22/feed.png
index a0b75f11dd,a0b75f11dd..a0b75f11dd
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/22/gear.png
index 9ccf5280b4,9ccf5280b4..9ccf5280b4
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/22/group.png
index f1360159b9,f1360159b9..f1360159b9
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/22/info.png
index 18d32664d4,18d32664d4..18d32664d4
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/22/link.png
index e819ad3ac8,e819ad3ac8..e819ad3ac8
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/22/lock.png
index 13b755810a,13b755810a..13b755810a
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/22/menu.png
index e3461da8b4,e3461da8b4..e3461da8b4
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/22/notice.png
index 2b97738929,2b97738929..2b97738929
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/22/notify_off.png
index 513687bc58,513687bc58..513687bc58
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/22/notify_on.png
index 18002e15c5,18002e15c5..18002e15c5
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/22/play.png
index a7a8b61241,a7a8b61241..a7a8b61241
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/22/plugin.png
index cf4421125b,cf4421125b..cf4421125b
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/22/star.png
index 484e247943,484e247943..484e247943
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/22/unlock.png
index 9be196f554,9be196f554..9be196f554
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/22/user.png
index 79bb05e4e7,79bb05e4e7..79bb05e4e7
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/48/add.png
index 753ac4b68d,753ac4b68d..753ac4b68d
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/48/delete.png
index 2835638a96,2835638a96..2835638a96
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/48/edit.png
index 709fbb357b,709fbb357b..709fbb357b
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/48/feed.png
index 13d88f7070,13d88f7070..13d88f7070
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/48/gear.png
index 8bb12e96ea,8bb12e96ea..8bb12e96ea
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/48/group.png
index 26238ac6ab,26238ac6ab..26238ac6ab
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/48/info.png
index 760eca5c3c,760eca5c3c..760eca5c3c
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/48/link.png
index b32eec5293,b32eec5293..b32eec5293
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/48/lock.png
index b9db282ac9,b9db282ac9..b9db282ac9
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/48/menu.png
index 376e60caba,376e60caba..376e60caba
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/48/notice.png
index f6fbc95c68,f6fbc95c68..f6fbc95c68
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/48/notify_off.png
index 7c8cd97881,7c8cd97881..7c8cd97881
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/48/notify_on.png
index 3275898c51,3275898c51..3275898c51
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/48/play.png
index fce5893704,fce5893704..fce5893704
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/48/plugin.png
index c74c6bf467,c74c6bf467..c74c6bf467
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/48/star.png
index f53914efae,f53914efae..f53914efae
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/48/unlock.png
index 9bf72a4c64,9bf72a4c64..9bf72a4c64
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/48/user.png
index c42410cd13,c42410cd13..c42410cd13
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/Makefile
index bfb5927df1,bfb5927df1..bfb5927df1
mode 100755,100755..100644
--- a/images/icons/Makefile
+++ b/images/icons/Makefile
diff --cc images/icons/add.png
index 78497fbc95,78497fbc95..78497fbc95
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/delete.png
index f0cae51548,f0cae51548..f0cae51548
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/edit.png
index aeaf835fec,aeaf835fec..aeaf835fec
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/feed.png
index 6894257e95,6894257e95..6894257e95
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/gear.png
index 02847ef9d5,02847ef9d5..02847ef9d5
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/group.png
index de0dc79014,de0dc79014..de0dc79014
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/info.png
index ea2b0ffa4f,ea2b0ffa4f..ea2b0ffa4f
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/link.png
index 743bdf0f93,743bdf0f93..743bdf0f93
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/lock.png
index 91a8f3ef2f,91a8f3ef2f..91a8f3ef2f
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/menu.png
index 56afc8541a,56afc8541a..56afc8541a
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/notice.png
index b6017c8de6,b6017c8de6..b6017c8de6
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/notify_off.png
index e6eac16b82,e6eac16b82..e6eac16b82
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/notify_on.png
index b9e07d24e6,b9e07d24e6..b9e07d24e6
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/play.png
index 7c942072e7,7c942072e7..7c942072e7
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/plugin.png
index 943be0d93e,943be0d93e..943be0d93e
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/star.png
index 4a2236c9b7,4a2236c9b7..4a2236c9b7
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/unlock.png
index 4bf7e7eae1,4bf7e7eae1..4bf7e7eae1
mode 100755,100755..100644
Binary files differ
diff --cc images/icons/user.png
index f1132b1ae6,f1132b1ae6..f1132b1ae6
mode 100755,100755..100644
Binary files differ
diff --cc images/larrow.gif
index ab08bb57e4,ab08bb57e4..ab08bb57e4
mode 100755,100755..100644
Binary files differ
diff --cc images/larrw.gif
index 08902d772a,08902d772a..08902d772a
mode 100755,100755..100644
Binary files differ
diff --cc images/like.gif
index f71d0324d2,f71d0324d2..f71d0324d2
mode 100755,100755..100644
Binary files differ
diff --cc images/link-icon.gif
index c012d716e2,c012d716e2..c012d716e2
mode 100755,100755..100644
Binary files differ
diff --cc images/lock_icon.gif
index b6b1b7fed5,b6b1b7fed5..b6b1b7fed5
mode 100755,100755..100644
Binary files differ
diff --cc images/logo.png
index 1b977b697a,1b977b697a..1b977b697a
mode 100755,100755..100644
Binary files differ
diff --cc images/lrarrow.gif
index fa26769446,fa26769446..fa26769446
mode 100755,100755..100644
Binary files differ
diff --cc images/mapicon.gif
index dd20c209b5,dd20c209b5..dd20c209b5
mode 100755,100755..100644
Binary files differ
diff --cc images/no.gif
index eb0f2b0e92,eb0f2b0e92..eb0f2b0e92
mode 100755,100755..100644
Binary files differ
diff --cc images/noglobe.gif
index 81e1765677,81e1765677..81e1765677
mode 100755,100755..100644
Binary files differ
diff --cc images/nosign.jpg
index b73629332d,b73629332d..b73629332d
mode 100755,100755..100644
Binary files differ
diff --cc images/onoff.jpg
index 7884912a7f,7884912a7f..7884912a7f
mode 100755,100755..100644
Binary files differ
diff --cc images/pause.gif
index dc57c4c981,dc57c4c981..dc57c4c981
mode 100755,100755..100644
Binary files differ
diff --cc images/pen.png
index 46b4049418,46b4049418..46b4049418
mode 100755,100755..100644
Binary files differ
diff --cc images/pencil.gif
index 26bfb0c9a4,26bfb0c9a4..26bfb0c9a4
mode 100755,100755..100644
Binary files differ
diff --cc images/penhover.png
index be48d77b41,be48d77b41..be48d77b41
mode 100755,100755..100644
Binary files differ
diff --cc images/people.gif
index cac31db2a9,cac31db2a9..cac31db2a9
mode 100755,100755..100644
Binary files differ
diff --cc images/play.gif
index 4010f056d2,4010f056d2..4010f056d2
mode 100755,100755..100644
Binary files differ
diff --cc images/plugin.png
index 08b09e0601,08b09e0601..08b09e0601
mode 100755,100755..100644
Binary files differ
diff --cc images/rarrow.gif
index a2d5df3e96,a2d5df3e96..a2d5df3e96
mode 100755,100755..100644
Binary files differ
diff --cc images/rarrw.gif
index 849238c2dc,849238c2dc..849238c2dc
mode 100755,100755..100644
Binary files differ
diff --cc images/recycle.gif
index 01b3e13b40,01b3e13b40..01b3e13b40
mode 100755,100755..100644
Binary files differ
diff --cc images/remote-link.gif
index 64de29aeee,64de29aeee..64de29aeee
mode 100755,100755..100644
Binary files differ
diff --cc images/rotator.gif
index 3797ec3e4b,3797ec3e4b..3797ec3e4b
mode 100755,100755..100644
Binary files differ
diff --cc images/search_18.png
index 5397396708,5397396708..5397396708
mode 100755,100755..100644
Binary files differ
diff --cc images/selected.png
index 79a7c77c6d,79a7c77c6d..79a7c77c6d
mode 100755,100755..100644
Binary files differ
diff --cc images/share.gif
index 035fa2e381,035fa2e381..035fa2e381
mode 100755,100755..100644
Binary files differ
diff --cc images/show_all_off.png
index cc96d28f06,cc96d28f06..cc96d28f06
mode 100755,100755..100644
Binary files differ
diff --cc images/show_all_on.png
index 87a7710b57,87a7710b57..87a7710b57
mode 100755,100755..100644
Binary files differ
diff --cc images/show_off.png
index 4bcf471237,4bcf471237..4bcf471237
mode 100755,100755..100644
Binary files differ
diff --cc images/show_on.png
index b8d1f5bac4,b8d1f5bac4..b8d1f5bac4
mode 100755,100755..100644
Binary files differ
diff --cc images/smiley-Oo.gif
index a15d974275,a15d974275..a15d974275
mode 100755,100755..100644
Binary files differ
diff --cc images/smiley-brokenheart.gif
index 971b57fd98,971b57fd98..971b57fd98
mode 100755,100755..100644
Binary files differ
diff --cc images/smiley-cool.gif
index cee1c1aa3d,cee1c1aa3d..cee1c1aa3d
mode 100755,100755..100644
Binary files differ
diff --cc images/smiley-cry.gif
index 06e6ca2c25,06e6ca2c25..06e6ca2c25
mode 100755,100755..100644
Binary files differ
diff --cc images/smiley-embarassed.gif
index adc12e7c51,adc12e7c51..adc12e7c51
mode 100755,100755..100644
Binary files differ
diff --cc images/smiley-foot-in-mouth.gif
index b444e5781e,b444e5781e..b444e5781e
mode 100755,100755..100644
Binary files differ
diff --cc images/smiley-frown.gif
index 9ff19850d9,9ff19850d9..9ff19850d9
mode 100755,100755..100644
Binary files differ
diff --cc images/smiley-heart.gif
index 6a11e70652,6a11e70652..6a11e70652
mode 100755,100755..100644
Binary files differ
diff --cc images/smiley-innocent.gif
index 9d747140ec,9d747140ec..9d747140ec
mode 100755,100755..100644
Binary files differ
diff --cc images/smiley-kiss.gif
index cc356611ee,cc356611ee..cc356611ee
mode 100755,100755..100644
Binary files differ
diff --cc images/smiley-laughing.gif
index 1bf29de795,1bf29de795..1bf29de795
mode 100755,100755..100644
Binary files differ
diff --cc images/smiley-money-mouth.gif
index 1e8ccd0f3d,1e8ccd0f3d..1e8ccd0f3d
mode 100755,100755..100644
Binary files differ
diff --cc images/smiley-sealed.gif
index 98186742d2,98186742d2..98186742d2
mode 100755,100755..100644
Binary files differ
diff --cc images/smiley-smile.gif
index b9bff40a43,b9bff40a43..b9bff40a43
mode 100755,100755..100644
Binary files differ
diff --cc images/smiley-surprised.gif
index b074653260,b074653260..b074653260
mode 100755,100755..100644
Binary files differ
diff --cc images/smiley-thumbsup.gif
index a9533a64d2,a9533a64d2..a9533a64d2
mode 100755,100755..100644
Binary files differ
diff --cc images/smiley-tongue-out.gif
index 48867dc262,48867dc262..48867dc262
mode 100755,100755..100644
Binary files differ
diff --cc images/smiley-undecided.gif
index 28029794f3,28029794f3..28029794f3
mode 100755,100755..100644
Binary files differ
diff --cc images/smiley-wink.gif
index e1cefb05c9,e1cefb05c9..e1cefb05c9
mode 100755,100755..100644
Binary files differ
diff --cc images/smiley-yell.gif
index 5296c88365,5296c88365..5296c88365
mode 100755,100755..100644
Binary files differ
diff --cc images/spencil.gif
index 0a2551ac08,0a2551ac08..0a2551ac08
mode 100755,100755..100644
Binary files differ
diff --cc images/star.png
index 0b00cb1893,0b00cb1893..0b00cb1893
mode 100755,100755..100644
Binary files differ
diff --cc images/tag.png
index 40c5fd44e2,40c5fd44e2..40c5fd44e2
mode 100755,100755..100644
Binary files differ
diff --cc images/tag_b.png
index 66c03415de,66c03415de..66c03415de
mode 100755,100755..100644
Binary files differ
diff --cc images/tools.png
index c17094a81b,c17094a81b..c17094a81b
mode 100755,100755..100644
Binary files differ
diff --cc images/twopeople.png
index 07a4a08825,07a4a08825..07a4a08825
mode 100755,100755..100644
Binary files differ
diff --cc images/unlock_icon.gif
index 254ac8bfd2,254ac8bfd2..254ac8bfd2
mode 100755,100755..100644
Binary files differ
diff --cc images/video.gif
index e4d5e8cddf,e4d5e8cddf..e4d5e8cddf
mode 100755,100755..100644
Binary files differ
diff --cc images/youtube_icon.gif
index 987b82bfdd,987b82bfdd..987b82bfdd
mode 100755,100755..100644
Binary files differ
diff --cc include/Contact.php
index d9949b1ef8,d9949b1ef8..d9949b1ef8
mode 100755,100755..100644
--- a/include/Contact.php
+++ b/include/Contact.php
diff --cc include/EmailNotification.php
index 8861e8f5d8,8861e8f5d8..8861e8f5d8
mode 100755,100755..100644
--- a/include/EmailNotification.php
+++ b/include/EmailNotification.php
diff --cc include/Photo.php
index 4d02b5c651,4d02b5c651..4d02b5c651
mode 100755,100755..100644
--- a/include/Photo.php
+++ b/include/Photo.php
diff --cc include/Scrape.php
index 9c237916bc,9c237916bc..9c237916bc
mode 100755,100755..100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
diff --cc include/acl_selectors.php
index a5f5aff532,a5f5aff532..a5f5aff532
mode 100755,100755..100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
diff --cc include/api.php
index 013f4b97ae,065f14cffb..065f14cffb
mode 100755,100755..100644
--- a/include/api.php
+++ b/include/api.php
diff --cc include/attach.php
index 6d611cec04,6d611cec04..6d611cec04
mode 100755,100755..100644
--- a/include/attach.php
+++ b/include/attach.php
diff --cc include/auth.php
index 835616a829,1341f3bb8a..1341f3bb8a
mode 100755,100755..100644
--- a/include/auth.php
+++ b/include/auth.php
diff --cc include/bb2diaspora.php
index 8487f845a6,8487f845a6..8487f845a6
mode 100755,100755..100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
diff --cc include/cache.php
index 3c8a3f7138,3c8a3f7138..3c8a3f7138
mode 100755,100755..100644
--- a/include/cache.php
+++ b/include/cache.php
diff --cc include/config.php
index f93cb52c95,4cff38090c..c999b76f2e
mode 100644,100755..100644
--- a/include/config.php
+++ b/include/config.php
@@@ -57,49 -53,59 +57,51 @@@ if(! function_exists('get_config')) 
  			}
  			return $a->config[$family][$key];
  		}
 +		$ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
 +				dbesc($family),
 +				dbesc($key)
 +		);
 +		if(count($ret)) {
 +			// manage array value
 +			$val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
 +			$a->config[$family][$key] = $val;
 +			return $val;
 +		}
 +		else {
 +			$a->config[$family][$key] = '!<unset>!';
 +		}
 +		return false;
  	}
 -	$ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
 -		dbesc($family),
 -		dbesc($key)
 -	);
 -	if(count($ret)) {
 -		// manage array value
 -		$val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
 -		$a->config[$family][$key] = $val;
 -		return $val;
 -	}
 -	else {
 -		$a->config[$family][$key] = '!<unset>!';
 -	}
 -	return false;
 -}}
 -
 -// Store a config value ($value) in the category ($family)
 -// under the key ($key)
 -// Return the value, or false if the database update failed
 +}
  
 +/**
 + * Store a config value ($value) in the category ($family)
 + * under the key ($key)
 + * 
 + * Return the value, or false if the database update failed
 + */
  if(! function_exists('set_config')) {
- 	function set_config($family,$key,$value) {
- 		global $a;
 +
- 		// manage array value
- 		$dbvalue = (is_array($value)?serialize($value):$value);
+ function set_config($family,$key,$value) {
+ 	global $a;
+ 	
+ 	// manage array value
+ 	$dbvalue = (is_array($value)?serialize($value):$value);
+ 	$dbvalue = (is_bool($value) ? intval($value) : $value);
  
 -	if(get_config($family,$key,true) === false) {
  		$a->config[$family][$key] = $value;
 -		$ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ",
 -			dbesc($family),
 -			dbesc($key),
 -			dbesc($dbvalue)
 +		$ret = q("REPLACE INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ",
 +				dbesc($family),
 +				dbesc($key),
 +				dbesc($dbvalue)
  		);
 -		if($ret) 
 +		if($ret) {
  			return $value;
 +		}
  		return $ret;
 -	}
 -	
 -	$ret = q("UPDATE `config` SET `v` = '%s' WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
 -		dbesc($dbvalue),
 -		dbesc($family),
 -		dbesc($key)
 -	);
 -
 -	$a->config[$family][$key] = $value;
  
 -	if($ret)
 -		return $value;
 -	return $ret;
 -}}
 +	}
 +}
  
  
  if(! function_exists('load_pconfig')) {
@@@ -139,86 -137,87 +141,87 @@@ if(! function_exists('get_pconfig')) 
  			}
  			return $a->config[$uid][$family][$key];
  		}
 -	}
  
 -	$ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
 -		intval($uid),
 -		dbesc($family),
 -		dbesc($key)
 -	);
  
 -	if(count($ret)) {
 -		$val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
 -		$a->config[$uid][$family][$key] = $val;
 -		return $val;
 -	}
 -	else {
 -		$a->config[$uid][$family][$key] = '!<unset>!';
 +		$ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
 +				intval($uid),
 +				dbesc($family),
 +				dbesc($key)
 +		);
 +
 +		if(count($ret)) {
 +			$val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
 +			$a->config[$uid][$family][$key] = $val;
 +			return $val;
 +		}
 +		else {
 +			$a->config[$uid][$family][$key] = '!<unset>!';
 +		}
 +		return false;
  	}
 -	return false;
 -}}
 +}
  
 +/**
 + * Delete a value from config. This function 
 + * deletes both: db value and cache entry. 
 + */
  if(! function_exists('del_config')) {
 -function del_config($family,$key) {
 -
 -	global $a;
 -	if(x($a->config[$family],$key))
 -		unset($a->config[$family][$key]);
 -	$ret = q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
 -		dbesc($family),
 -		dbesc($key)
 -	);
 -	return $ret;
 -}}
 -
 -
 +	function del_config($family,$key) {
 +
 +		global $a;
 +		if(x($a->config[$family],$key))
 +			unset($a->config[$family][$key]);
 +		$ret = q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
 +				dbesc($family),
 +				dbesc($key)
 +		);
 +		return $ret;
 +	}
 +}
  
 -// Same as above functions except these are for personal config storage and take an
 -// additional $uid argument.
  
 +/**
 + * Store a user-specific config value ($value) for user $uid in the category ($family)
 + * under the key ($key). 
 + * 
 + * Return the value, or false if the database update failed
 + */
  if(! function_exists('set_pconfig')) {
 -function set_pconfig($uid,$family,$key,$value) {
 +	function set_pconfig($uid,$family,$key,$value) {
  
 -	global $a;
 +		global $a;
 +
 +		// manage array value
 +		$dbvalue = (is_array($value)?serialize($value):$value);
++		$dbvalue = (is_bool($value)?serialize($value):$value);
  
 -	// manage array value
 -	$dbvalue = (is_array($value)?serialize($value):$value);
  
 -	if(get_pconfig($uid,$family,$key,true) === false) {
  		$a->config[$uid][$family][$key] = $value;
 -		$ret = q("INSERT INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ",
 -			intval($uid),
 -			dbesc($family),
 -			dbesc($key),
 -			dbesc($dbvalue)
 +		$ret = q("REPLACE INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ",
 +				intval($uid),
 +				dbesc($family),
 +				dbesc($key),
 +				dbesc($dbvalue)
  		);
 -		if($ret) 
 +		if($ret) {
  			return $value;
 +		}
  		return $ret;
 -	}
 -	$ret = q("UPDATE `pconfig` SET `v` = '%s' WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
 -		dbesc($dbvalue),
 -		intval($uid),
 -		dbesc($family),
 -		dbesc($key)
 -	);
 -
 -	$a->config[$uid][$family][$key] = $value;
  
 -	if($ret)
 -		return $value;
 -	return $ret;
 -}}
 +	}
 +}
  
  if(! function_exists('del_pconfig')) {
 -function del_pconfig($uid,$family,$key) {
 -
 -	global $a;
 -	if(x($a->config[$uid][$family],$key))
 -		unset($a->config[$uid][$family][$key]);
 -	$ret = q("DELETE FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
 -		intval($uid),
 -		dbesc($family),
 -		dbesc($key)
 -	);
 -	return $ret;
 -}}
 +	function del_pconfig($uid,$family,$key) {
 +
 +		global $a;
 +		if(x($a->config[$uid][$family],$key))
 +			unset($a->config[$uid][$family][$key]);
 +		$ret = q("DELETE FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
 +				intval($uid),
 +				dbesc($family),
 +				dbesc($key)
 +		);
 +		return $ret;
 +	}
 +}
diff --cc include/contact_selectors.php
index 4b3ca987a6,4b3ca987a6..4b3ca987a6
mode 100755,100755..100644
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
diff --cc include/contact_widgets.php
index 605a3eb78e,e0f37f078f..e0f37f078f
mode 100755,100755..100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
diff --cc include/conversation.php
index 5de4fcb51a,df92a40ed0..df92a40ed0
mode 100755,100755..100644
--- a/include/conversation.php
+++ b/include/conversation.php
diff --cc include/cronhooks.php
index 37541f013e,37541f013e..37541f013e
mode 100755,100755..100644
--- a/include/cronhooks.php
+++ b/include/cronhooks.php
diff --cc include/crypto.php
index 0feb45c247,0feb45c247..0feb45c247
mode 100755,100755..100644
--- a/include/crypto.php
+++ b/include/crypto.php
diff --cc include/datetime.php
index 6d395fe3f2,6d395fe3f2..6d395fe3f2
mode 100755,100755..100644
--- a/include/datetime.php
+++ b/include/datetime.php
diff --cc include/dba.php
index 5beea7a3ac,76cc0bc7b9..76cc0bc7b9
mode 100755,100755..100644
--- a/include/dba.php
+++ b/include/dba.php
diff --cc include/delivery.php
index 532dcd6991,794b8f27a3..794b8f27a3
mode 100755,100755..100644
--- a/include/delivery.php
+++ b/include/delivery.php
diff --cc include/diaspora.php
index 1b5af42cd9,06df9c24a4..06df9c24a4
mode 100755,100755..100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
diff --cc include/directory.php
index cae78adb4e,cae78adb4e..cae78adb4e
mode 100755,100755..100644
--- a/include/directory.php
+++ b/include/directory.php
diff --cc include/email.php
index 8ea8145fb6,b43ae0dc1c..b43ae0dc1c
mode 100755,100755..100644
--- a/include/email.php
+++ b/include/email.php
diff --cc include/enotify.php
index a505f1f040,8385bdec59..8385bdec59
mode 100755,100755..100644
--- a/include/enotify.php
+++ b/include/enotify.php
diff --cc include/event.php
index 29202baddf,29202baddf..29202baddf
mode 100755,100755..100644
--- a/include/event.php
+++ b/include/event.php
diff --cc include/expire.php
index 5fa0ec758b,5fa0ec758b..5fa0ec758b
mode 100755,100755..100644
--- a/include/expire.php
+++ b/include/expire.php
diff --cc include/fcontact.php
index 8821a985f2,8821a985f2..8821a985f2
mode 100755,100755..100644
--- a/include/fcontact.php
+++ b/include/fcontact.php
diff --cc include/group.php
index 4a35912e5d,4a35912e5d..4a35912e5d
mode 100755,100755..100644
--- a/include/group.php
+++ b/include/group.php
diff --cc include/html2bbcode.php
index 69ccf41b71,69ccf41b71..69ccf41b71
mode 100755,100755..100644
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
diff --cc include/items.php
index 5a297c83ef,ee69605349..ee69605349
mode 100755,100755..100644
--- a/include/items.php
+++ b/include/items.php
diff --cc include/message.php
index 7ad80ae9c6,377d7c715b..377d7c715b
mode 100755,100755..100644
--- a/include/message.php
+++ b/include/message.php
diff --cc include/nav.php
index f40e92dbce,2c9c643a92..2c9c643a92
mode 100755,100755..100644
--- a/include/nav.php
+++ b/include/nav.php
diff --cc include/network.php
index 22157ff188,38d0980d50..38d0980d50
mode 100755,100755..100644
--- a/include/network.php
+++ b/include/network.php
diff --cc include/notifier.php
index d63ad7ae7c,ca7c7b92eb..ca7c7b92eb
mode 100755,100755..100644
--- a/include/notifier.php
+++ b/include/notifier.php
diff --cc include/oauth.php
index 2724dcf7cf,2724dcf7cf..2724dcf7cf
mode 100755,100755..100644
--- a/include/oauth.php
+++ b/include/oauth.php
diff --cc include/oembed.php
index cc71f9757c,1f45d28143..1f45d28143
mode 100755,100755..100644
--- a/include/oembed.php
+++ b/include/oembed.php
diff --cc include/pgettext.php
index 83e76ba9d6,83e76ba9d6..83e76ba9d6
mode 100755,100755..100644
--- a/include/pgettext.php
+++ b/include/pgettext.php
diff --cc include/plugin.php
index 8280b1022e,e37ae84357..e37ae84357
mode 100755,100755..100644
--- a/include/plugin.php
+++ b/include/plugin.php
diff --cc include/poller.php
index 8262c1d605,90a97867c2..90a97867c2
mode 100755,100755..100644
--- a/include/poller.php
+++ b/include/poller.php
diff --cc include/profile_advanced.php
index 004a58524b,004a58524b..004a58524b
mode 100755,100755..100644
--- a/include/profile_advanced.php
+++ b/include/profile_advanced.php
diff --cc include/profile_selectors.php
index 92579f64aa,92579f64aa..92579f64aa
mode 100755,100755..100644
--- a/include/profile_selectors.php
+++ b/include/profile_selectors.php
diff --cc include/profile_update.php
index 61eaee75d9,61eaee75d9..61eaee75d9
mode 100755,100755..100644
--- a/include/profile_update.php
+++ b/include/profile_update.php
diff --cc include/queue.php
index 7e92705be2,7e92705be2..7e92705be2
mode 100755,100755..100644
--- a/include/queue.php
+++ b/include/queue.php
diff --cc include/queue_fn.php
index 3c1087f4eb,3c1087f4eb..3c1087f4eb
mode 100755,100755..100644
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
diff --cc include/remoteupdate.php
index 9effc9b6e9,9effc9b6e9..9effc9b6e9
mode 100755,100755..100644
--- a/include/remoteupdate.php
+++ b/include/remoteupdate.php
diff --cc include/salmon.php
index 3d525f51ad,3d525f51ad..3d525f51ad
mode 100755,100755..100644
--- a/include/salmon.php
+++ b/include/salmon.php
diff --cc include/security.php
index 19e91eb63d,66622fd331..66622fd331
mode 100755,100755..100644
--- a/include/security.php
+++ b/include/security.php
diff --cc include/session.php
index 6c32e299ff,6c32e299ff..6c32e299ff
mode 100755,100755..100644
--- a/include/session.php
+++ b/include/session.php
diff --cc include/socgraph.php
index b2f5455094,3f51940492..3f51940492
mode 100755,100755..100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
diff --cc include/system_unavailable.php
index bd7196cdfd,bd7196cdfd..bd7196cdfd
mode 100755,100755..100644
--- a/include/system_unavailable.php
+++ b/include/system_unavailable.php
diff --cc include/template_processor.php
index 4c317efe1f,4c317efe1f..4c317efe1f
mode 100755,100755..100644
--- a/include/template_processor.php
+++ b/include/template_processor.php
diff --cc index.php
index 5f6d74adb9,e7227962f4..e7227962f4
mode 100755,100755..100644
--- a/index.php
+++ b/index.php
diff --cc js/acl.js
index e383224ca8,e383224ca8..e383224ca8
mode 100755,100755..100644
--- a/js/acl.js
+++ b/js/acl.js
diff --cc js/ajaxupload.js
index 67c4a56fb7,67c4a56fb7..67c4a56fb7
mode 100755,100755..100644
--- a/js/ajaxupload.js
+++ b/js/ajaxupload.js
diff --cc js/country.js
index b18a529d1c,1c75055801..1c75055801
mode 100755,100755..100644
--- a/js/country.js
+++ b/js/country.js
diff --cc js/fk.autocomplete.js
index b1db92c414,b1db92c414..b1db92c414
mode 100755,100755..100644
--- a/js/fk.autocomplete.js
+++ b/js/fk.autocomplete.js
diff --cc js/jquery.htmlstream.js
index c62c538f77,c62c538f77..c62c538f77
mode 100755,100755..100644
--- a/js/jquery.htmlstream.js
+++ b/js/jquery.htmlstream.js
diff --cc js/jquery.js
index 198b3ff07d,198b3ff07d..198b3ff07d
mode 100755,100755..100644
--- a/js/jquery.js
+++ b/js/jquery.js
diff --cc js/jquery.textinputs.js
index fd6d145690,fd6d145690..fd6d145690
mode 100755,100755..100644
--- a/js/jquery.textinputs.js
+++ b/js/jquery.textinputs.js
diff --cc js/main.js
index babd2a1c38,744691b6da..744691b6da
mode 100755,100755..100644
--- a/js/main.js
+++ b/js/main.js
diff --cc js/webtoolkit.base64.js
index 5fa3c1ed7b,5fa3c1ed7b..5fa3c1ed7b
mode 100755,100755..100644
--- a/js/webtoolkit.base64.js
+++ b/js/webtoolkit.base64.js
diff --cc library/ASNValue.class.php
index 7a3c5d20ef,7a3c5d20ef..7a3c5d20ef
mode 100755,100755..100644
--- a/library/ASNValue.class.php
+++ b/library/ASNValue.class.php
diff --cc library/HTML5/Data.php
index fa97e3ee88,fa97e3ee88..fa97e3ee88
mode 100755,100755..100644
--- a/library/HTML5/Data.php
+++ b/library/HTML5/Data.php
diff --cc library/HTML5/InputStream.php
index f98b427238,f98b427238..f98b427238
mode 100755,100755..100644
--- a/library/HTML5/InputStream.php
+++ b/library/HTML5/InputStream.php
diff --cc library/HTML5/Parser.php
index 5f9ca560e5,5f9ca560e5..5f9ca560e5
mode 100755,100755..100644
--- a/library/HTML5/Parser.php
+++ b/library/HTML5/Parser.php
diff --cc library/HTML5/Tokenizer.php
index 06c73065f3,06c73065f3..06c73065f3
mode 100755,100755..100644
--- a/library/HTML5/Tokenizer.php
+++ b/library/HTML5/Tokenizer.php
diff --cc library/HTML5/TreeBuilder.php
index 578e73682b,578e73682b..578e73682b
mode 100755,100755..100644
--- a/library/HTML5/TreeBuilder.php
+++ b/library/HTML5/TreeBuilder.php
diff --cc library/HTML5/named-character-references.ser
index 3004c4b91d,3004c4b91d..3004c4b91d
mode 100755,100755..100644
--- a/library/HTML5/named-character-references.ser
+++ b/library/HTML5/named-character-references.ser
diff --cc library/HTMLPurifier.auto.php
index 1960c399f8,1960c399f8..1960c399f8
mode 100755,100755..100644
--- a/library/HTMLPurifier.auto.php
+++ b/library/HTMLPurifier.auto.php
diff --cc library/HTMLPurifier.autoload.php
index 8d40176406,8d40176406..8d40176406
mode 100755,100755..100644
--- a/library/HTMLPurifier.autoload.php
+++ b/library/HTMLPurifier.autoload.php
diff --cc library/HTMLPurifier.func.php
index 56a55b2fed,56a55b2fed..56a55b2fed
mode 100755,100755..100644
--- a/library/HTMLPurifier.func.php
+++ b/library/HTMLPurifier.func.php
diff --cc library/HTMLPurifier.includes.php
index 2ed0f0c17f,2ed0f0c17f..2ed0f0c17f
mode 100755,100755..100644
--- a/library/HTMLPurifier.includes.php
+++ b/library/HTMLPurifier.includes.php
diff --cc library/HTMLPurifier.kses.php
index 3143feb17f,3143feb17f..3143feb17f
mode 100755,100755..100644
--- a/library/HTMLPurifier.kses.php
+++ b/library/HTMLPurifier.kses.php
diff --cc library/HTMLPurifier.path.php
index 39b1b65319,39b1b65319..39b1b65319
mode 100755,100755..100644
--- a/library/HTMLPurifier.path.php
+++ b/library/HTMLPurifier.path.php
diff --cc library/HTMLPurifier.php
index ba2c7b3067,ba2c7b3067..ba2c7b3067
mode 100755,100755..100644
--- a/library/HTMLPurifier.php
+++ b/library/HTMLPurifier.php
diff --cc library/HTMLPurifier.safe-includes.php
index 6402de0458,6402de0458..6402de0458
mode 100755,100755..100644
--- a/library/HTMLPurifier.safe-includes.php
+++ b/library/HTMLPurifier.safe-includes.php
diff --cc library/HTMLPurifier/AttrCollections.php
index 555b86d042,555b86d042..555b86d042
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrCollections.php
+++ b/library/HTMLPurifier/AttrCollections.php
diff --cc library/HTMLPurifier/AttrDef.php
index b2e4f36c5d,b2e4f36c5d..b2e4f36c5d
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef.php
+++ b/library/HTMLPurifier/AttrDef.php
diff --cc library/HTMLPurifier/AttrDef/CSS.php
index 953e706755,953e706755..953e706755
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS.php
+++ b/library/HTMLPurifier/AttrDef/CSS.php
diff --cc library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
index 292c040d4b,292c040d4b..292c040d4b
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
+++ b/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
diff --cc library/HTMLPurifier/AttrDef/CSS/Background.php
index 3a3d20cd6a,3a3d20cd6a..3a3d20cd6a
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/Background.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Background.php
diff --cc library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
index fae82eaec8,fae82eaec8..fae82eaec8
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
+++ b/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
diff --cc library/HTMLPurifier/AttrDef/CSS/Border.php
index 42a1d1b4ae,42a1d1b4ae..42a1d1b4ae
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/Border.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Border.php
diff --cc library/HTMLPurifier/AttrDef/CSS/Color.php
index 07f95a6719,07f95a6719..07f95a6719
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/Color.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Color.php
diff --cc library/HTMLPurifier/AttrDef/CSS/Composite.php
index de1289cba8,de1289cba8..de1289cba8
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/Composite.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Composite.php
diff --cc library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
index 6599c5b2dd,6599c5b2dd..6599c5b2dd
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
+++ b/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
diff --cc library/HTMLPurifier/AttrDef/CSS/Filter.php
index 147894b861,147894b861..147894b861
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/Filter.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Filter.php
diff --cc library/HTMLPurifier/AttrDef/CSS/Font.php
index 699ee0b701,699ee0b701..699ee0b701
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/Font.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Font.php
diff --cc library/HTMLPurifier/AttrDef/CSS/FontFamily.php
index 42c2054c2a,42c2054c2a..42c2054c2a
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
+++ b/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
diff --cc library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
index 4e6b35e5a0,4e6b35e5a0..4e6b35e5a0
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
+++ b/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
diff --cc library/HTMLPurifier/AttrDef/CSS/Length.php
index a07ec58135,a07ec58135..a07ec58135
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/Length.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Length.php
diff --cc library/HTMLPurifier/AttrDef/CSS/ListStyle.php
index 4406868c08,4406868c08..4406868c08
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
+++ b/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
diff --cc library/HTMLPurifier/AttrDef/CSS/Multiple.php
index 4d62a40d7f,4d62a40d7f..4d62a40d7f
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/Multiple.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Multiple.php
diff --cc library/HTMLPurifier/AttrDef/CSS/Number.php
index 3f99e12ec2,3f99e12ec2..3f99e12ec2
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/Number.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Number.php
diff --cc library/HTMLPurifier/AttrDef/CSS/Percentage.php
index c34b8fc3c3,c34b8fc3c3..c34b8fc3c3
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/Percentage.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Percentage.php
diff --cc library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
index 772c922d80,772c922d80..772c922d80
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
+++ b/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
diff --cc library/HTMLPurifier/AttrDef/CSS/URI.php
index 1df17dc25b,1df17dc25b..1df17dc25b
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/URI.php
+++ b/library/HTMLPurifier/AttrDef/CSS/URI.php
diff --cc library/HTMLPurifier/AttrDef/Enum.php
index 5d603ebcc6,5d603ebcc6..5d603ebcc6
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/Enum.php
+++ b/library/HTMLPurifier/AttrDef/Enum.php
diff --cc library/HTMLPurifier/AttrDef/HTML/Bool.php
index e06987eb8d,e06987eb8d..e06987eb8d
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/HTML/Bool.php
+++ b/library/HTMLPurifier/AttrDef/HTML/Bool.php
diff --cc library/HTMLPurifier/AttrDef/HTML/Class.php
index 370068d975,370068d975..370068d975
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/HTML/Class.php
+++ b/library/HTMLPurifier/AttrDef/HTML/Class.php
diff --cc library/HTMLPurifier/AttrDef/HTML/Color.php
index d01e20454e,d01e20454e..d01e20454e
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/HTML/Color.php
+++ b/library/HTMLPurifier/AttrDef/HTML/Color.php
diff --cc library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
index ae6ea7c01d,ae6ea7c01d..ae6ea7c01d
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
+++ b/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
diff --cc library/HTMLPurifier/AttrDef/HTML/ID.php
index 81d03762de,81d03762de..81d03762de
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/HTML/ID.php
+++ b/library/HTMLPurifier/AttrDef/HTML/ID.php
diff --cc library/HTMLPurifier/AttrDef/HTML/Length.php
index a242f9c238,a242f9c238..a242f9c238
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/HTML/Length.php
+++ b/library/HTMLPurifier/AttrDef/HTML/Length.php
diff --cc library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
index 76d25ed088,76d25ed088..76d25ed088
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
+++ b/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
diff --cc library/HTMLPurifier/AttrDef/HTML/MultiLength.php
index c72fc76e4d,c72fc76e4d..c72fc76e4d
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
+++ b/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
diff --cc library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
index aa34120bd2,aa34120bd2..aa34120bd2
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
+++ b/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
diff --cc library/HTMLPurifier/AttrDef/HTML/Pixels.php
index 4cb2c1b857,4cb2c1b857..4cb2c1b857
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/HTML/Pixels.php
+++ b/library/HTMLPurifier/AttrDef/HTML/Pixels.php
diff --cc library/HTMLPurifier/AttrDef/Integer.php
index d59738d2a2,d59738d2a2..d59738d2a2
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/Integer.php
+++ b/library/HTMLPurifier/AttrDef/Integer.php
diff --cc library/HTMLPurifier/AttrDef/Lang.php
index 10e6da56db,10e6da56db..10e6da56db
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/Lang.php
+++ b/library/HTMLPurifier/AttrDef/Lang.php
diff --cc library/HTMLPurifier/AttrDef/Switch.php
index c9e3ed193e,c9e3ed193e..c9e3ed193e
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/Switch.php
+++ b/library/HTMLPurifier/AttrDef/Switch.php
diff --cc library/HTMLPurifier/AttrDef/Text.php
index c6216cc531,c6216cc531..c6216cc531
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/Text.php
+++ b/library/HTMLPurifier/AttrDef/Text.php
diff --cc library/HTMLPurifier/AttrDef/URI.php
index 01a6d83e95,01a6d83e95..01a6d83e95
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/URI.php
+++ b/library/HTMLPurifier/AttrDef/URI.php
diff --cc library/HTMLPurifier/AttrDef/URI/Email.php
index bfee9d166c,bfee9d166c..bfee9d166c
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/URI/Email.php
+++ b/library/HTMLPurifier/AttrDef/URI/Email.php
diff --cc library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
index 94c715ab43,94c715ab43..94c715ab43
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
+++ b/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
diff --cc library/HTMLPurifier/AttrDef/URI/Host.php
index 2156c10c66,2156c10c66..2156c10c66
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/URI/Host.php
+++ b/library/HTMLPurifier/AttrDef/URI/Host.php
diff --cc library/HTMLPurifier/AttrDef/URI/IPv4.php
index ec4cf591b8,ec4cf591b8..ec4cf591b8
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/URI/IPv4.php
+++ b/library/HTMLPurifier/AttrDef/URI/IPv4.php
diff --cc library/HTMLPurifier/AttrDef/URI/IPv6.php
index 9454e9be50,9454e9be50..9454e9be50
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrDef/URI/IPv6.php
+++ b/library/HTMLPurifier/AttrDef/URI/IPv6.php
diff --cc library/HTMLPurifier/AttrTransform.php
index e61d3e01b6,e61d3e01b6..e61d3e01b6
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrTransform.php
+++ b/library/HTMLPurifier/AttrTransform.php
diff --cc library/HTMLPurifier/AttrTransform/Background.php
index 0e1ff24a3e,0e1ff24a3e..0e1ff24a3e
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrTransform/Background.php
+++ b/library/HTMLPurifier/AttrTransform/Background.php
diff --cc library/HTMLPurifier/AttrTransform/BdoDir.php
index 4d1a05665e,4d1a05665e..4d1a05665e
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrTransform/BdoDir.php
+++ b/library/HTMLPurifier/AttrTransform/BdoDir.php
diff --cc library/HTMLPurifier/AttrTransform/BgColor.php
index ad3916bb96,ad3916bb96..ad3916bb96
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrTransform/BgColor.php
+++ b/library/HTMLPurifier/AttrTransform/BgColor.php
diff --cc library/HTMLPurifier/AttrTransform/BoolToCSS.php
index 51159b6715,51159b6715..51159b6715
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrTransform/BoolToCSS.php
+++ b/library/HTMLPurifier/AttrTransform/BoolToCSS.php
diff --cc library/HTMLPurifier/AttrTransform/Border.php
index 476b0b079b,476b0b079b..476b0b079b
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrTransform/Border.php
+++ b/library/HTMLPurifier/AttrTransform/Border.php
diff --cc library/HTMLPurifier/AttrTransform/EnumToCSS.php
index 2a5b4514ab,2a5b4514ab..2a5b4514ab
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrTransform/EnumToCSS.php
+++ b/library/HTMLPurifier/AttrTransform/EnumToCSS.php
diff --cc library/HTMLPurifier/AttrTransform/ImgRequired.php
index 7f0e4b7a59,7f0e4b7a59..7f0e4b7a59
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrTransform/ImgRequired.php
+++ b/library/HTMLPurifier/AttrTransform/ImgRequired.php
diff --cc library/HTMLPurifier/AttrTransform/ImgSpace.php
index fd84c10c36,fd84c10c36..fd84c10c36
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrTransform/ImgSpace.php
+++ b/library/HTMLPurifier/AttrTransform/ImgSpace.php
diff --cc library/HTMLPurifier/AttrTransform/Input.php
index 16829552d1,16829552d1..16829552d1
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrTransform/Input.php
+++ b/library/HTMLPurifier/AttrTransform/Input.php
diff --cc library/HTMLPurifier/AttrTransform/Lang.php
index 5869e7f820,5869e7f820..5869e7f820
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrTransform/Lang.php
+++ b/library/HTMLPurifier/AttrTransform/Lang.php
diff --cc library/HTMLPurifier/AttrTransform/Length.php
index ea2f30473d,ea2f30473d..ea2f30473d
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrTransform/Length.php
+++ b/library/HTMLPurifier/AttrTransform/Length.php
diff --cc library/HTMLPurifier/AttrTransform/Name.php
index 15315bc735,15315bc735..15315bc735
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrTransform/Name.php
+++ b/library/HTMLPurifier/AttrTransform/Name.php
diff --cc library/HTMLPurifier/AttrTransform/NameSync.php
index a95638c140,a95638c140..a95638c140
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrTransform/NameSync.php
+++ b/library/HTMLPurifier/AttrTransform/NameSync.php
diff --cc library/HTMLPurifier/AttrTransform/SafeEmbed.php
index 4da449981f,4da449981f..4da449981f
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrTransform/SafeEmbed.php
+++ b/library/HTMLPurifier/AttrTransform/SafeEmbed.php
diff --cc library/HTMLPurifier/AttrTransform/SafeObject.php
index 1ed74898ba,1ed74898ba..1ed74898ba
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrTransform/SafeObject.php
+++ b/library/HTMLPurifier/AttrTransform/SafeObject.php
diff --cc library/HTMLPurifier/AttrTransform/SafeParam.php
index 3f992ec31b,3f992ec31b..3f992ec31b
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrTransform/SafeParam.php
+++ b/library/HTMLPurifier/AttrTransform/SafeParam.php
diff --cc library/HTMLPurifier/AttrTransform/ScriptRequired.php
index 4499050a22,4499050a22..4499050a22
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrTransform/ScriptRequired.php
+++ b/library/HTMLPurifier/AttrTransform/ScriptRequired.php
diff --cc library/HTMLPurifier/AttrTransform/Textarea.php
index 81ac3488ba,81ac3488ba..81ac3488ba
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrTransform/Textarea.php
+++ b/library/HTMLPurifier/AttrTransform/Textarea.php
diff --cc library/HTMLPurifier/AttrTypes.php
index fc2ea4e588,fc2ea4e588..fc2ea4e588
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrTypes.php
+++ b/library/HTMLPurifier/AttrTypes.php
diff --cc library/HTMLPurifier/AttrValidator.php
index 829a0f8f22,829a0f8f22..829a0f8f22
mode 100755,100755..100644
--- a/library/HTMLPurifier/AttrValidator.php
+++ b/library/HTMLPurifier/AttrValidator.php
diff --cc library/HTMLPurifier/Bootstrap.php
index 559f61a232,559f61a232..559f61a232
mode 100755,100755..100644
--- a/library/HTMLPurifier/Bootstrap.php
+++ b/library/HTMLPurifier/Bootstrap.php
diff --cc library/HTMLPurifier/CSSDefinition.php
index 6a2e6f56d9,6a2e6f56d9..6a2e6f56d9
mode 100755,100755..100644
--- a/library/HTMLPurifier/CSSDefinition.php
+++ b/library/HTMLPurifier/CSSDefinition.php
diff --cc library/HTMLPurifier/ChildDef.php
index c5d5216dab,c5d5216dab..c5d5216dab
mode 100755,100755..100644
--- a/library/HTMLPurifier/ChildDef.php
+++ b/library/HTMLPurifier/ChildDef.php
diff --cc library/HTMLPurifier/ChildDef/Chameleon.php
index 15c364ee33,15c364ee33..15c364ee33
mode 100755,100755..100644
--- a/library/HTMLPurifier/ChildDef/Chameleon.php
+++ b/library/HTMLPurifier/ChildDef/Chameleon.php
diff --cc library/HTMLPurifier/ChildDef/Custom.php
index b68047b4b5,b68047b4b5..b68047b4b5
mode 100755,100755..100644
--- a/library/HTMLPurifier/ChildDef/Custom.php
+++ b/library/HTMLPurifier/ChildDef/Custom.php
diff --cc library/HTMLPurifier/ChildDef/Empty.php
index 13171f6651,13171f6651..13171f6651
mode 100755,100755..100644
--- a/library/HTMLPurifier/ChildDef/Empty.php
+++ b/library/HTMLPurifier/ChildDef/Empty.php
diff --cc library/HTMLPurifier/ChildDef/Optional.php
index 32bcb9898e,32bcb9898e..32bcb9898e
mode 100755,100755..100644
--- a/library/HTMLPurifier/ChildDef/Optional.php
+++ b/library/HTMLPurifier/ChildDef/Optional.php
diff --cc library/HTMLPurifier/ChildDef/Required.php
index 4889f249b8,4889f249b8..4889f249b8
mode 100755,100755..100644
--- a/library/HTMLPurifier/ChildDef/Required.php
+++ b/library/HTMLPurifier/ChildDef/Required.php
diff --cc library/HTMLPurifier/ChildDef/StrictBlockquote.php
index dfae8a6e5e,dfae8a6e5e..dfae8a6e5e
mode 100755,100755..100644
--- a/library/HTMLPurifier/ChildDef/StrictBlockquote.php
+++ b/library/HTMLPurifier/ChildDef/StrictBlockquote.php
diff --cc library/HTMLPurifier/ChildDef/Table.php
index 34f0227dd2,34f0227dd2..34f0227dd2
mode 100755,100755..100644
--- a/library/HTMLPurifier/ChildDef/Table.php
+++ b/library/HTMLPurifier/ChildDef/Table.php
diff --cc library/HTMLPurifier/Config.php
index 2a334b0d83,2a334b0d83..2a334b0d83
mode 100755,100755..100644
--- a/library/HTMLPurifier/Config.php
+++ b/library/HTMLPurifier/Config.php
diff --cc library/HTMLPurifier/ConfigSchema.php
index 67be5c71fd,67be5c71fd..67be5c71fd
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema.php
+++ b/library/HTMLPurifier/ConfigSchema.php
diff --cc library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
index c05668a706,c05668a706..c05668a706
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
+++ b/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
diff --cc library/HTMLPurifier/ConfigSchema/Builder/Xml.php
index 244561a372,244561a372..244561a372
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/Builder/Xml.php
+++ b/library/HTMLPurifier/ConfigSchema/Builder/Xml.php
diff --cc library/HTMLPurifier/ConfigSchema/Exception.php
index 2671516c58,2671516c58..2671516c58
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/Exception.php
+++ b/library/HTMLPurifier/ConfigSchema/Exception.php
diff --cc library/HTMLPurifier/ConfigSchema/Interchange.php
index 91a5aa7303,91a5aa7303..91a5aa7303
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/Interchange.php
+++ b/library/HTMLPurifier/ConfigSchema/Interchange.php
diff --cc library/HTMLPurifier/ConfigSchema/Interchange/Directive.php
index ac8be0d970,ac8be0d970..ac8be0d970
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php
+++ b/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php
diff --cc library/HTMLPurifier/ConfigSchema/Interchange/Id.php
index b9b3c6f5cf,b9b3c6f5cf..b9b3c6f5cf
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/Interchange/Id.php
+++ b/library/HTMLPurifier/ConfigSchema/Interchange/Id.php
diff --cc library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
index 785b72ce8e,785b72ce8e..785b72ce8e
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
+++ b/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
diff --cc library/HTMLPurifier/ConfigSchema/Validator.php
index f374f6a022,f374f6a022..f374f6a022
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/Validator.php
+++ b/library/HTMLPurifier/ConfigSchema/Validator.php
diff --cc library/HTMLPurifier/ConfigSchema/ValidatorAtom.php
index b95aea18cc,b95aea18cc..b95aea18cc
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php
+++ b/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php
diff --cc library/HTMLPurifier/ConfigSchema/schema.ser
index 22b8d54a59,22b8d54a59..22b8d54a59
mode 100755,100755..100644
Binary files differ
diff --cc library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
index 0517fed0a1,0517fed0a1..0517fed0a1
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
index 249edd647b,249edd647b..249edd647b
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
index 9a8fa6a2e2,9a8fa6a2e2..9a8fa6a2e2
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
index b017883485,b017883485..b017883485
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
index e774b823b1,e774b823b1..e774b823b1
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
index 533165e175,533165e175..533165e175
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
index 9eb7e38469,9eb7e38469..9eb7e38469
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
index 2f17bf477a,2f17bf477a..2f17bf477a
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
index 52654b53ae,52654b53ae..52654b53ae
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
index 6440d21032,6440d21032..6440d21032
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
index f31d226f58,f31d226f58..f31d226f58
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
index 5f2b5e3d2c,5f2b5e3d2c..5f2b5e3d2c
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
index 6f5824586e,6f5824586e..6f5824586e
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
index cc49d43fd0,cc49d43fd0..cc49d43fd0
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
index 2c5924a7ad,2c5924a7ad..2c5924a7ad
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
index d5caa1bb97,d5caa1bb97..d5caa1bb97
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
index 2a476481af,2a476481af..2a476481af
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
index 663064a344,663064a344..663064a344
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
index 3a48ba960e,3a48ba960e..3a48ba960e
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
index db58b13464,db58b13464..db58b13464
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
index 7996488be0,7996488be0..7996488be0
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
index 35c393b4e6,35c393b4e6..35c393b4e6
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
index ca17eb1dc4,ca17eb1dc4..ca17eb1dc4
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
index 34657ba47b,34657ba47b..34657ba47b
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
index dde990ab26,dde990ab26..dde990ab26
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
index b324608f76,b324608f76..b324608f76
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
index 748be0eec8,748be0eec8..748be0eec8
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
index 460112ebe0,460112ebe0..460112ebe0
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
index 5cb7dda3ba,5cb7dda3ba..5cb7dda3ba
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
index 7a3291470c,7a3291470c..7a3291470c
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
index 148eedb8be,148eedb8be..148eedb8be
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
index c486724c88,c486724c88..c486724c88
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
index 54036507d6,54036507d6..54036507d6
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
index 568cbf3b32,568cbf3b32..568cbf3b32
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
index d7317911fa,d7317911fa..d7317911fa
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
index 08b381d34c,08b381d34c..08b381d34c
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
index 64b114fce2,64b114fce2..64b114fce2
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
index 36f16e07ea,36f16e07ea..36f16e07ea
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
index 8bfb47c3ac,8bfb47c3ac..8bfb47c3ac
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
index 4d5b5055cd,4d5b5055cd..4d5b5055cd
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
index a7a5b249bb,a7a5b249bb..a7a5b249bb
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
index abb499948a,abb499948a..abb499948a
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
index 915391edb7,915391edb7..915391edb7
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
index 233fca14f8,233fca14f8..233fca14f8
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
index 8983e2cca9,8983e2cca9..8983e2cca9
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
index eb841a7597,eb841a7597..eb841a7597
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
index 4070c2a0de,4070c2a0de..4070c2a0de
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
index a4cd966df8,a4cd966df8..a4cd966df8
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
index 3db50ef204,3db50ef204..3db50ef204
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
index 16829bcda0,16829bcda0..16829bcda0
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
index 7f95f54d12,7f95f54d12..7f95f54d12
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
index 6c231b2d7f,6c231b2d7f..6c231b2d7f
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
index 078d087417,078d087417..078d087417
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
index 7fa6536b2c,7fa6536b2c..7fa6536b2c
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
index 3e231d2d16,3e231d2d16..3e231d2d16
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
index fcf093f17d,fcf093f17d..fcf093f17d
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
index 888d558196,888d558196..888d558196
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
index 5a59a55c08,5a59a55c08..5a59a55c08
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
index 151fb7b826,151fb7b826..151fb7b826
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
index 45ae469ec9,45ae469ec9..45ae469ec9
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
index 5246188795,5246188795..5246188795
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
index a64e3d7c36,a64e3d7c36..a64e3d7c36
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
index 103db754a2,103db754a2..103db754a2
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
index 229ae0267a,229ae0267a..229ae0267a
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
index 9dab497f2f,9dab497f2f..9dab497f2f
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
index 57358f9bad,57358f9bad..57358f9bad
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
index 93a53e14fb,93a53e14fb..93a53e14fb
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
index e424c386ec,e424c386ec..e424c386ec
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
index 62e8e160c7,62e8e160c7..62e8e160c7
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
index dfb720496d,dfb720496d..dfb720496d
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
index cdda09a4c5,cdda09a4c5..cdda09a4c5
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
index ceb342e22b,ceb342e22b..ceb342e22b
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
index a8b1de56be,a8b1de56be..a8b1de56be
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
index b4c271b7fa,b4c271b7fa..b4c271b7fa
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
index 4186ccd0d1,4186ccd0d1..4186ccd0d1
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
index 996762bd1d,996762bd1d..996762bd1d
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
index 89133b1a38,89133b1a38..89133b1a38
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
index 2a47e384f4,2a47e384f4..2a47e384f4
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
index 08921fde70,08921fde70..08921fde70
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
index 93398e8598,93398e8598..93398e8598
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
index 79f8ad82cf,79f8ad82cf..79f8ad82cf
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
index 232b02362a,232b02362a..232b02362a
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
index 06bab00a0a,06bab00a0a..06bab00a0a
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
index 071bc0295d,071bc0295d..071bc0295d
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
index ae3a913f24,ae3a913f24..ae3a913f24
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
index 876f0680cf,876f0680cf..876f0680cf
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
index 728e378cbe,728e378cbe..728e378cbe
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
index f05312ba86,f05312ba86..f05312ba86
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
index 80cfea93f7,80cfea93f7..80cfea93f7
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
index 71ce025a2d,71ce025a2d..71ce025a2d
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
index 13c122c8ce,13c122c8ce..13c122c8ce
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
index abcc1efd61,abcc1efd61..abcc1efd61
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
index 51e6ea91f7,51e6ea91f7..51e6ea91f7
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
index ee83b121de,ee83b121de..ee83b121de
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
index 0b6df7625d,0b6df7625d..0b6df7625d
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
index 4214900a59,4214900a59..4214900a59
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
index 58c81dcc44,58c81dcc44..58c81dcc44
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
index 6fce0fdc37,6fce0fdc37..6fce0fdc37
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
index 0d00f62ea8,0d00f62ea8..0d00f62ea8
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
index 23331a4e79,23331a4e79..23331a4e79
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
diff --cc library/HTMLPurifier/ConfigSchema/schema/info.ini
index 5de4505e1b,5de4505e1b..5de4505e1b
mode 100755,100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/info.ini
+++ b/library/HTMLPurifier/ConfigSchema/schema/info.ini
diff --cc library/HTMLPurifier/ContentSets.php
index 3b6e96f5f5,3b6e96f5f5..3b6e96f5f5
mode 100755,100755..100644
--- a/library/HTMLPurifier/ContentSets.php
+++ b/library/HTMLPurifier/ContentSets.php
diff --cc library/HTMLPurifier/Context.php
index 9ddf0c5476,9ddf0c5476..9ddf0c5476
mode 100755,100755..100644
--- a/library/HTMLPurifier/Context.php
+++ b/library/HTMLPurifier/Context.php
diff --cc library/HTMLPurifier/Definition.php
index a7408c9749,a7408c9749..a7408c9749
mode 100755,100755..100644
--- a/library/HTMLPurifier/Definition.php
+++ b/library/HTMLPurifier/Definition.php
diff --cc library/HTMLPurifier/DefinitionCache.php
index c6e1e388c6,c6e1e388c6..c6e1e388c6
mode 100755,100755..100644
--- a/library/HTMLPurifier/DefinitionCache.php
+++ b/library/HTMLPurifier/DefinitionCache.php
diff --cc library/HTMLPurifier/DefinitionCache/Decorator.php
index b0fb6d0cd6,b0fb6d0cd6..b0fb6d0cd6
mode 100755,100755..100644
--- a/library/HTMLPurifier/DefinitionCache/Decorator.php
+++ b/library/HTMLPurifier/DefinitionCache/Decorator.php
diff --cc library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
index d4cc35c4bc,d4cc35c4bc..d4cc35c4bc
mode 100755,100755..100644
--- a/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
+++ b/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
diff --cc library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
index 18f16d32b6,18f16d32b6..18f16d32b6
mode 100755,100755..100644
--- a/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
+++ b/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
diff --cc library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
index 21a8fcfda2,21a8fcfda2..21a8fcfda2
mode 100755,100755..100644
--- a/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
+++ b/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
diff --cc library/HTMLPurifier/DefinitionCache/Null.php
index 41d97e734f,41d97e734f..41d97e734f
mode 100755,100755..100644
--- a/library/HTMLPurifier/DefinitionCache/Null.php
+++ b/library/HTMLPurifier/DefinitionCache/Null.php
diff --cc library/HTMLPurifier/DefinitionCache/Serializer.php
index 7a6aa93f02,7a6aa93f02..7a6aa93f02
mode 100755,100755..100644
--- a/library/HTMLPurifier/DefinitionCache/Serializer.php
+++ b/library/HTMLPurifier/DefinitionCache/Serializer.php
diff --cc library/HTMLPurifier/DefinitionCache/Serializer/README
index 2e35c1c3d0,2e35c1c3d0..2e35c1c3d0
mode 100755,100755..100644
--- a/library/HTMLPurifier/DefinitionCache/Serializer/README
+++ b/library/HTMLPurifier/DefinitionCache/Serializer/README
diff --cc library/HTMLPurifier/DefinitionCacheFactory.php
index a6ead62818,a6ead62818..a6ead62818
mode 100755,100755..100644
--- a/library/HTMLPurifier/DefinitionCacheFactory.php
+++ b/library/HTMLPurifier/DefinitionCacheFactory.php
diff --cc library/HTMLPurifier/Doctype.php
index 1e3c574c06,1e3c574c06..1e3c574c06
mode 100755,100755..100644
--- a/library/HTMLPurifier/Doctype.php
+++ b/library/HTMLPurifier/Doctype.php
diff --cc library/HTMLPurifier/DoctypeRegistry.php
index 86049e9391,86049e9391..86049e9391
mode 100755,100755..100644
--- a/library/HTMLPurifier/DoctypeRegistry.php
+++ b/library/HTMLPurifier/DoctypeRegistry.php
diff --cc library/HTMLPurifier/ElementDef.php
index 5498d95670,5498d95670..5498d95670
mode 100755,100755..100644
--- a/library/HTMLPurifier/ElementDef.php
+++ b/library/HTMLPurifier/ElementDef.php
diff --cc library/HTMLPurifier/Encoder.php
index 2b3140caaf,2b3140caaf..2b3140caaf
mode 100755,100755..100644
--- a/library/HTMLPurifier/Encoder.php
+++ b/library/HTMLPurifier/Encoder.php
diff --cc library/HTMLPurifier/EntityLookup.php
index b4dfce94c3,b4dfce94c3..b4dfce94c3
mode 100755,100755..100644
--- a/library/HTMLPurifier/EntityLookup.php
+++ b/library/HTMLPurifier/EntityLookup.php
diff --cc library/HTMLPurifier/EntityLookup/entities.ser
index f2b8b8f2db,f2b8b8f2db..f2b8b8f2db
mode 100755,100755..100644
--- a/library/HTMLPurifier/EntityLookup/entities.ser
+++ b/library/HTMLPurifier/EntityLookup/entities.ser
diff --cc library/HTMLPurifier/EntityParser.php
index 8c384472dc,8c384472dc..8c384472dc
mode 100755,100755..100644
--- a/library/HTMLPurifier/EntityParser.php
+++ b/library/HTMLPurifier/EntityParser.php
diff --cc library/HTMLPurifier/ErrorCollector.php
index 6713eaf773,6713eaf773..6713eaf773
mode 100755,100755..100644
--- a/library/HTMLPurifier/ErrorCollector.php
+++ b/library/HTMLPurifier/ErrorCollector.php
diff --cc library/HTMLPurifier/ErrorStruct.php
index 9bc8996ec1,9bc8996ec1..9bc8996ec1
mode 100755,100755..100644
--- a/library/HTMLPurifier/ErrorStruct.php
+++ b/library/HTMLPurifier/ErrorStruct.php
diff --cc library/HTMLPurifier/Exception.php
index be85b4c560,be85b4c560..be85b4c560
mode 100755,100755..100644
--- a/library/HTMLPurifier/Exception.php
+++ b/library/HTMLPurifier/Exception.php
diff --cc library/HTMLPurifier/Filter.php
index 9a0e7b09f3,9a0e7b09f3..9a0e7b09f3
mode 100755,100755..100644
--- a/library/HTMLPurifier/Filter.php
+++ b/library/HTMLPurifier/Filter.php
diff --cc library/HTMLPurifier/Filter/ExtractStyleBlocks.php
index bbf78a6630,bbf78a6630..bbf78a6630
mode 100755,100755..100644
--- a/library/HTMLPurifier/Filter/ExtractStyleBlocks.php
+++ b/library/HTMLPurifier/Filter/ExtractStyleBlocks.php
diff --cc library/HTMLPurifier/Filter/YouTube.php
index 23df221eaa,23df221eaa..23df221eaa
mode 100755,100755..100644
--- a/library/HTMLPurifier/Filter/YouTube.php
+++ b/library/HTMLPurifier/Filter/YouTube.php
diff --cc library/HTMLPurifier/Generator.php
index 4a62417271,4a62417271..4a62417271
mode 100755,100755..100644
--- a/library/HTMLPurifier/Generator.php
+++ b/library/HTMLPurifier/Generator.php
diff --cc library/HTMLPurifier/HTMLDefinition.php
index c99ac11eb2,c99ac11eb2..c99ac11eb2
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLDefinition.php
+++ b/library/HTMLPurifier/HTMLDefinition.php
diff --cc library/HTMLPurifier/HTMLModule.php
index 072cf68084,072cf68084..072cf68084
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule.php
+++ b/library/HTMLPurifier/HTMLModule.php
diff --cc library/HTMLPurifier/HTMLModule/Bdo.php
index 3d66f1b4e1,3d66f1b4e1..3d66f1b4e1
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/Bdo.php
+++ b/library/HTMLPurifier/HTMLModule/Bdo.php
diff --cc library/HTMLPurifier/HTMLModule/CommonAttributes.php
index 7c15da84fc,7c15da84fc..7c15da84fc
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/CommonAttributes.php
+++ b/library/HTMLPurifier/HTMLModule/CommonAttributes.php
diff --cc library/HTMLPurifier/HTMLModule/Edit.php
index ff93690555,ff93690555..ff93690555
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/Edit.php
+++ b/library/HTMLPurifier/HTMLModule/Edit.php
diff --cc library/HTMLPurifier/HTMLModule/Forms.php
index 44c22f6f8b,44c22f6f8b..44c22f6f8b
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/Forms.php
+++ b/library/HTMLPurifier/HTMLModule/Forms.php
diff --cc library/HTMLPurifier/HTMLModule/Hypertext.php
index d7e9bdd27e,d7e9bdd27e..d7e9bdd27e
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/Hypertext.php
+++ b/library/HTMLPurifier/HTMLModule/Hypertext.php
diff --cc library/HTMLPurifier/HTMLModule/Image.php
index 948d435bcd,948d435bcd..948d435bcd
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/Image.php
+++ b/library/HTMLPurifier/HTMLModule/Image.php
diff --cc library/HTMLPurifier/HTMLModule/Legacy.php
index df33927ba6,df33927ba6..df33927ba6
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/Legacy.php
+++ b/library/HTMLPurifier/HTMLModule/Legacy.php
diff --cc library/HTMLPurifier/HTMLModule/List.php
index 74d4522f4e,74d4522f4e..74d4522f4e
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/List.php
+++ b/library/HTMLPurifier/HTMLModule/List.php
diff --cc library/HTMLPurifier/HTMLModule/Name.php
index 05694b4504,05694b4504..05694b4504
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/Name.php
+++ b/library/HTMLPurifier/HTMLModule/Name.php
diff --cc library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
index 5f1b14abb8,5f1b14abb8..5f1b14abb8
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
+++ b/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
diff --cc library/HTMLPurifier/HTMLModule/Object.php
index 193c1011f8,193c1011f8..193c1011f8
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/Object.php
+++ b/library/HTMLPurifier/HTMLModule/Object.php
diff --cc library/HTMLPurifier/HTMLModule/Presentation.php
index 8ff0b5ed78,8ff0b5ed78..8ff0b5ed78
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/Presentation.php
+++ b/library/HTMLPurifier/HTMLModule/Presentation.php
diff --cc library/HTMLPurifier/HTMLModule/Proprietary.php
index dd36a3de0e,dd36a3de0e..dd36a3de0e
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/Proprietary.php
+++ b/library/HTMLPurifier/HTMLModule/Proprietary.php
diff --cc library/HTMLPurifier/HTMLModule/Ruby.php
index b26a0a30a0,b26a0a30a0..b26a0a30a0
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/Ruby.php
+++ b/library/HTMLPurifier/HTMLModule/Ruby.php
diff --cc library/HTMLPurifier/HTMLModule/SafeEmbed.php
index ea256716bb,ea256716bb..ea256716bb
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/SafeEmbed.php
+++ b/library/HTMLPurifier/HTMLModule/SafeEmbed.php
diff --cc library/HTMLPurifier/HTMLModule/SafeObject.php
index 64ab8c0703,64ab8c0703..64ab8c0703
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/SafeObject.php
+++ b/library/HTMLPurifier/HTMLModule/SafeObject.php
diff --cc library/HTMLPurifier/HTMLModule/Scripting.php
index cecdea6c30,cecdea6c30..cecdea6c30
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/Scripting.php
+++ b/library/HTMLPurifier/HTMLModule/Scripting.php
diff --cc library/HTMLPurifier/HTMLModule/StyleAttribute.php
index eb78464cc0,eb78464cc0..eb78464cc0
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/StyleAttribute.php
+++ b/library/HTMLPurifier/HTMLModule/StyleAttribute.php
diff --cc library/HTMLPurifier/HTMLModule/Tables.php
index f314ced3f8,f314ced3f8..f314ced3f8
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/Tables.php
+++ b/library/HTMLPurifier/HTMLModule/Tables.php
diff --cc library/HTMLPurifier/HTMLModule/Target.php
index 2b844ecc45,2b844ecc45..2b844ecc45
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/Target.php
+++ b/library/HTMLPurifier/HTMLModule/Target.php
diff --cc library/HTMLPurifier/HTMLModule/Text.php
index ae77c71886,ae77c71886..ae77c71886
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/Text.php
+++ b/library/HTMLPurifier/HTMLModule/Text.php
diff --cc library/HTMLPurifier/HTMLModule/Tidy.php
index 21783f18eb,21783f18eb..21783f18eb
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/Tidy.php
+++ b/library/HTMLPurifier/HTMLModule/Tidy.php
diff --cc library/HTMLPurifier/HTMLModule/Tidy/Name.php
index 61ff85ce2f,61ff85ce2f..61ff85ce2f
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/Tidy/Name.php
+++ b/library/HTMLPurifier/HTMLModule/Tidy/Name.php
diff --cc library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
index 14c15c4a06,14c15c4a06..14c15c4a06
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
+++ b/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
diff --cc library/HTMLPurifier/HTMLModule/Tidy/Strict.php
index c73dc3c4d1,c73dc3c4d1..c73dc3c4d1
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/Tidy/Strict.php
+++ b/library/HTMLPurifier/HTMLModule/Tidy/Strict.php
diff --cc library/HTMLPurifier/HTMLModule/Tidy/Transitional.php
index 9960b1dd10,9960b1dd10..9960b1dd10
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php
+++ b/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php
diff --cc library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
index db5a378e53,db5a378e53..db5a378e53
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
+++ b/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
diff --cc library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
index 02e9438139,02e9438139..02e9438139
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
+++ b/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
diff --cc library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
index 9c0e031984,9c0e031984..9c0e031984
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
+++ b/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
diff --cc library/HTMLPurifier/HTMLModuleManager.php
index f5c4a1d2cb,f5c4a1d2cb..f5c4a1d2cb
mode 100755,100755..100644
--- a/library/HTMLPurifier/HTMLModuleManager.php
+++ b/library/HTMLPurifier/HTMLModuleManager.php
diff --cc library/HTMLPurifier/IDAccumulator.php
index 73215295a5,73215295a5..73215295a5
mode 100755,100755..100644
--- a/library/HTMLPurifier/IDAccumulator.php
+++ b/library/HTMLPurifier/IDAccumulator.php
diff --cc library/HTMLPurifier/Injector.php
index 5922f81305,5922f81305..5922f81305
mode 100755,100755..100644
--- a/library/HTMLPurifier/Injector.php
+++ b/library/HTMLPurifier/Injector.php
diff --cc library/HTMLPurifier/Injector/AutoParagraph.php
index afa7608924,afa7608924..afa7608924
mode 100755,100755..100644
--- a/library/HTMLPurifier/Injector/AutoParagraph.php
+++ b/library/HTMLPurifier/Injector/AutoParagraph.php
diff --cc library/HTMLPurifier/Injector/DisplayLinkURI.php
index 9dce9bd085,9dce9bd085..9dce9bd085
mode 100755,100755..100644
--- a/library/HTMLPurifier/Injector/DisplayLinkURI.php
+++ b/library/HTMLPurifier/Injector/DisplayLinkURI.php
diff --cc library/HTMLPurifier/Injector/Linkify.php
index 296dac2829,296dac2829..296dac2829
mode 100755,100755..100644
--- a/library/HTMLPurifier/Injector/Linkify.php
+++ b/library/HTMLPurifier/Injector/Linkify.php
diff --cc library/HTMLPurifier/Injector/PurifierLinkify.php
index ad2455a91c,ad2455a91c..ad2455a91c
mode 100755,100755..100644
--- a/library/HTMLPurifier/Injector/PurifierLinkify.php
+++ b/library/HTMLPurifier/Injector/PurifierLinkify.php
diff --cc library/HTMLPurifier/Injector/RemoveEmpty.php
index 638bfca03b,638bfca03b..638bfca03b
mode 100755,100755..100644
--- a/library/HTMLPurifier/Injector/RemoveEmpty.php
+++ b/library/HTMLPurifier/Injector/RemoveEmpty.php
diff --cc library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
index b21313470e,b21313470e..b21313470e
mode 100755,100755..100644
--- a/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
+++ b/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
diff --cc library/HTMLPurifier/Injector/SafeObject.php
index 9e178ce01a,9e178ce01a..9e178ce01a
mode 100755,100755..100644
--- a/library/HTMLPurifier/Injector/SafeObject.php
+++ b/library/HTMLPurifier/Injector/SafeObject.php
diff --cc library/HTMLPurifier/Language.php
index 3e2be03b58,3e2be03b58..3e2be03b58
mode 100755,100755..100644
--- a/library/HTMLPurifier/Language.php
+++ b/library/HTMLPurifier/Language.php
diff --cc library/HTMLPurifier/Language/classes/en-x-test.php
index d52fcb7ac1,d52fcb7ac1..d52fcb7ac1
mode 100755,100755..100644
--- a/library/HTMLPurifier/Language/classes/en-x-test.php
+++ b/library/HTMLPurifier/Language/classes/en-x-test.php
diff --cc library/HTMLPurifier/Language/messages/en-x-test.php
index 1c046f379e,1c046f379e..1c046f379e
mode 100755,100755..100644
--- a/library/HTMLPurifier/Language/messages/en-x-test.php
+++ b/library/HTMLPurifier/Language/messages/en-x-test.php
diff --cc library/HTMLPurifier/Language/messages/en-x-testmini.php
index 806c83fbf7,806c83fbf7..806c83fbf7
mode 100755,100755..100644
--- a/library/HTMLPurifier/Language/messages/en-x-testmini.php
+++ b/library/HTMLPurifier/Language/messages/en-x-testmini.php
diff --cc library/HTMLPurifier/Language/messages/en.php
index 8d7b5736bb,8d7b5736bb..8d7b5736bb
mode 100755,100755..100644
--- a/library/HTMLPurifier/Language/messages/en.php
+++ b/library/HTMLPurifier/Language/messages/en.php
diff --cc library/HTMLPurifier/LanguageFactory.php
index 134ef8c745,134ef8c745..134ef8c745
mode 100755,100755..100644
--- a/library/HTMLPurifier/LanguageFactory.php
+++ b/library/HTMLPurifier/LanguageFactory.php
diff --cc library/HTMLPurifier/Length.php
index 8d2a46b7da,8d2a46b7da..8d2a46b7da
mode 100755,100755..100644
--- a/library/HTMLPurifier/Length.php
+++ b/library/HTMLPurifier/Length.php
diff --cc library/HTMLPurifier/Lexer.php
index b05e115468,b05e115468..b05e115468
mode 100755,100755..100644
--- a/library/HTMLPurifier/Lexer.php
+++ b/library/HTMLPurifier/Lexer.php
diff --cc library/HTMLPurifier/Lexer/DOMLex.php
index 20dc2ed48c,20dc2ed48c..20dc2ed48c
mode 100755,100755..100644
--- a/library/HTMLPurifier/Lexer/DOMLex.php
+++ b/library/HTMLPurifier/Lexer/DOMLex.php
diff --cc library/HTMLPurifier/Lexer/DirectLex.php
index 456e6e1908,456e6e1908..456e6e1908
mode 100755,100755..100644
--- a/library/HTMLPurifier/Lexer/DirectLex.php
+++ b/library/HTMLPurifier/Lexer/DirectLex.php
diff --cc library/HTMLPurifier/Lexer/PEARSax3.php
index 1d358c7b6b,1d358c7b6b..1d358c7b6b
mode 100755,100755..100644
--- a/library/HTMLPurifier/Lexer/PEARSax3.php
+++ b/library/HTMLPurifier/Lexer/PEARSax3.php
diff --cc library/HTMLPurifier/Lexer/PH5P.php
index fa1bf973e0,fa1bf973e0..fa1bf973e0
mode 100755,100755..100644
--- a/library/HTMLPurifier/Lexer/PH5P.php
+++ b/library/HTMLPurifier/Lexer/PH5P.php
diff --cc library/HTMLPurifier/PercentEncoder.php
index a43c44f4c5,a43c44f4c5..a43c44f4c5
mode 100755,100755..100644
--- a/library/HTMLPurifier/PercentEncoder.php
+++ b/library/HTMLPurifier/PercentEncoder.php
diff --cc library/HTMLPurifier/Printer.php
index e7eb82e83e,e7eb82e83e..e7eb82e83e
mode 100755,100755..100644
--- a/library/HTMLPurifier/Printer.php
+++ b/library/HTMLPurifier/Printer.php
diff --cc library/HTMLPurifier/Printer/CSSDefinition.php
index 81f9865901,81f9865901..81f9865901
mode 100755,100755..100644
--- a/library/HTMLPurifier/Printer/CSSDefinition.php
+++ b/library/HTMLPurifier/Printer/CSSDefinition.php
diff --cc library/HTMLPurifier/Printer/ConfigForm.css
index 3ff1a88aa4,3ff1a88aa4..3ff1a88aa4
mode 100755,100755..100644
--- a/library/HTMLPurifier/Printer/ConfigForm.css
+++ b/library/HTMLPurifier/Printer/ConfigForm.css
diff --cc library/HTMLPurifier/Printer/ConfigForm.js
index cba00c9b80,cba00c9b80..cba00c9b80
mode 100755,100755..100644
--- a/library/HTMLPurifier/Printer/ConfigForm.js
+++ b/library/HTMLPurifier/Printer/ConfigForm.js
diff --cc library/HTMLPurifier/Printer/ConfigForm.php
index 02aa656894,02aa656894..02aa656894
mode 100755,100755..100644
--- a/library/HTMLPurifier/Printer/ConfigForm.php
+++ b/library/HTMLPurifier/Printer/ConfigForm.php
diff --cc library/HTMLPurifier/Printer/HTMLDefinition.php
index 8a8f126b81,8a8f126b81..8a8f126b81
mode 100755,100755..100644
--- a/library/HTMLPurifier/Printer/HTMLDefinition.php
+++ b/library/HTMLPurifier/Printer/HTMLDefinition.php
diff --cc library/HTMLPurifier/PropertyList.php
index 2b99fb7bc3,2b99fb7bc3..2b99fb7bc3
mode 100755,100755..100644
--- a/library/HTMLPurifier/PropertyList.php
+++ b/library/HTMLPurifier/PropertyList.php
diff --cc library/HTMLPurifier/PropertyListIterator.php
index 8f250443e4,8f250443e4..8f250443e4
mode 100755,100755..100644
--- a/library/HTMLPurifier/PropertyListIterator.php
+++ b/library/HTMLPurifier/PropertyListIterator.php
diff --cc library/HTMLPurifier/Strategy.php
index 2462865210,2462865210..2462865210
mode 100755,100755..100644
--- a/library/HTMLPurifier/Strategy.php
+++ b/library/HTMLPurifier/Strategy.php
diff --cc library/HTMLPurifier/Strategy/Composite.php
index 816490b799,816490b799..816490b799
mode 100755,100755..100644
--- a/library/HTMLPurifier/Strategy/Composite.php
+++ b/library/HTMLPurifier/Strategy/Composite.php
diff --cc library/HTMLPurifier/Strategy/Core.php
index d90e158606,d90e158606..d90e158606
mode 100755,100755..100644
--- a/library/HTMLPurifier/Strategy/Core.php
+++ b/library/HTMLPurifier/Strategy/Core.php
diff --cc library/HTMLPurifier/Strategy/FixNesting.php
index f81802391b,f81802391b..f81802391b
mode 100755,100755..100644
--- a/library/HTMLPurifier/Strategy/FixNesting.php
+++ b/library/HTMLPurifier/Strategy/FixNesting.php
diff --cc library/HTMLPurifier/Strategy/MakeWellFormed.php
index c736584007,c736584007..c736584007
mode 100755,100755..100644
--- a/library/HTMLPurifier/Strategy/MakeWellFormed.php
+++ b/library/HTMLPurifier/Strategy/MakeWellFormed.php
diff --cc library/HTMLPurifier/Strategy/RemoveForeignElements.php
index cf3a33e406,cf3a33e406..cf3a33e406
mode 100755,100755..100644
--- a/library/HTMLPurifier/Strategy/RemoveForeignElements.php
+++ b/library/HTMLPurifier/Strategy/RemoveForeignElements.php
diff --cc library/HTMLPurifier/Strategy/ValidateAttributes.php
index c3328a9d44,c3328a9d44..c3328a9d44
mode 100755,100755..100644
--- a/library/HTMLPurifier/Strategy/ValidateAttributes.php
+++ b/library/HTMLPurifier/Strategy/ValidateAttributes.php
diff --cc library/HTMLPurifier/StringHash.php
index 62085c5c2f,62085c5c2f..62085c5c2f
mode 100755,100755..100644
--- a/library/HTMLPurifier/StringHash.php
+++ b/library/HTMLPurifier/StringHash.php
diff --cc library/HTMLPurifier/StringHashParser.php
index f3e70c712f,f3e70c712f..f3e70c712f
mode 100755,100755..100644
--- a/library/HTMLPurifier/StringHashParser.php
+++ b/library/HTMLPurifier/StringHashParser.php
diff --cc library/HTMLPurifier/TagTransform.php
index 210a447217,210a447217..210a447217
mode 100755,100755..100644
--- a/library/HTMLPurifier/TagTransform.php
+++ b/library/HTMLPurifier/TagTransform.php
diff --cc library/HTMLPurifier/TagTransform/Font.php
index ed2463786d,ed2463786d..ed2463786d
mode 100755,100755..100644
--- a/library/HTMLPurifier/TagTransform/Font.php
+++ b/library/HTMLPurifier/TagTransform/Font.php
diff --cc library/HTMLPurifier/TagTransform/Simple.php
index 0e36130f25,0e36130f25..0e36130f25
mode 100755,100755..100644
--- a/library/HTMLPurifier/TagTransform/Simple.php
+++ b/library/HTMLPurifier/TagTransform/Simple.php
diff --cc library/HTMLPurifier/Token.php
index 7900e6cb10,7900e6cb10..7900e6cb10
mode 100755,100755..100644
--- a/library/HTMLPurifier/Token.php
+++ b/library/HTMLPurifier/Token.php
diff --cc library/HTMLPurifier/Token/Comment.php
index dc6bdcabb8,dc6bdcabb8..dc6bdcabb8
mode 100755,100755..100644
--- a/library/HTMLPurifier/Token/Comment.php
+++ b/library/HTMLPurifier/Token/Comment.php
diff --cc library/HTMLPurifier/Token/Empty.php
index 2a82b47ad1,2a82b47ad1..2a82b47ad1
mode 100755,100755..100644
--- a/library/HTMLPurifier/Token/Empty.php
+++ b/library/HTMLPurifier/Token/Empty.php
diff --cc library/HTMLPurifier/Token/End.php
index 353e79daf7,353e79daf7..353e79daf7
mode 100755,100755..100644
--- a/library/HTMLPurifier/Token/End.php
+++ b/library/HTMLPurifier/Token/End.php
diff --cc library/HTMLPurifier/Token/Start.php
index e0e14fc624,e0e14fc624..e0e14fc624
mode 100755,100755..100644
--- a/library/HTMLPurifier/Token/Start.php
+++ b/library/HTMLPurifier/Token/Start.php
diff --cc library/HTMLPurifier/Token/Tag.php
index 798be028ee,798be028ee..798be028ee
mode 100755,100755..100644
--- a/library/HTMLPurifier/Token/Tag.php
+++ b/library/HTMLPurifier/Token/Tag.php
diff --cc library/HTMLPurifier/Token/Text.php
index 82efd823d6,82efd823d6..82efd823d6
mode 100755,100755..100644
--- a/library/HTMLPurifier/Token/Text.php
+++ b/library/HTMLPurifier/Token/Text.php
diff --cc library/HTMLPurifier/TokenFactory.php
index 7cf48fb41c,7cf48fb41c..7cf48fb41c
mode 100755,100755..100644
--- a/library/HTMLPurifier/TokenFactory.php
+++ b/library/HTMLPurifier/TokenFactory.php
diff --cc library/HTMLPurifier/URI.php
index 8b50d0d18d,8b50d0d18d..8b50d0d18d
mode 100755,100755..100644
--- a/library/HTMLPurifier/URI.php
+++ b/library/HTMLPurifier/URI.php
diff --cc library/HTMLPurifier/URIDefinition.php
index ea2b8fe245,ea2b8fe245..ea2b8fe245
mode 100755,100755..100644
--- a/library/HTMLPurifier/URIDefinition.php
+++ b/library/HTMLPurifier/URIDefinition.php
diff --cc library/HTMLPurifier/URIFilter.php
index c116f93dff,c116f93dff..c116f93dff
mode 100755,100755..100644
--- a/library/HTMLPurifier/URIFilter.php
+++ b/library/HTMLPurifier/URIFilter.php
diff --cc library/HTMLPurifier/URIFilter/DisableExternal.php
index d8a39a5011,d8a39a5011..d8a39a5011
mode 100755,100755..100644
--- a/library/HTMLPurifier/URIFilter/DisableExternal.php
+++ b/library/HTMLPurifier/URIFilter/DisableExternal.php
diff --cc library/HTMLPurifier/URIFilter/DisableExternalResources.php
index 881abc43cf,881abc43cf..881abc43cf
mode 100755,100755..100644
--- a/library/HTMLPurifier/URIFilter/DisableExternalResources.php
+++ b/library/HTMLPurifier/URIFilter/DisableExternalResources.php
diff --cc library/HTMLPurifier/URIFilter/HostBlacklist.php
index 045aa0992c,045aa0992c..045aa0992c
mode 100755,100755..100644
--- a/library/HTMLPurifier/URIFilter/HostBlacklist.php
+++ b/library/HTMLPurifier/URIFilter/HostBlacklist.php
diff --cc library/HTMLPurifier/URIFilter/MakeAbsolute.php
index f46ab2630d,f46ab2630d..f46ab2630d
mode 100755,100755..100644
--- a/library/HTMLPurifier/URIFilter/MakeAbsolute.php
+++ b/library/HTMLPurifier/URIFilter/MakeAbsolute.php
diff --cc library/HTMLPurifier/URIFilter/Munge.php
index efa10a6458,efa10a6458..efa10a6458
mode 100755,100755..100644
--- a/library/HTMLPurifier/URIFilter/Munge.php
+++ b/library/HTMLPurifier/URIFilter/Munge.php
diff --cc library/HTMLPurifier/URIParser.php
index 7179e4ab89,7179e4ab89..7179e4ab89
mode 100755,100755..100644
--- a/library/HTMLPurifier/URIParser.php
+++ b/library/HTMLPurifier/URIParser.php
diff --cc library/HTMLPurifier/URIScheme.php
index 039710fd15,039710fd15..039710fd15
mode 100755,100755..100644
--- a/library/HTMLPurifier/URIScheme.php
+++ b/library/HTMLPurifier/URIScheme.php
diff --cc library/HTMLPurifier/URIScheme/data.php
index b7f1989cbf,b7f1989cbf..b7f1989cbf
mode 100755,100755..100644
--- a/library/HTMLPurifier/URIScheme/data.php
+++ b/library/HTMLPurifier/URIScheme/data.php
diff --cc library/HTMLPurifier/URIScheme/ftp.php
index 5849bf7ff0,5849bf7ff0..5849bf7ff0
mode 100755,100755..100644
--- a/library/HTMLPurifier/URIScheme/ftp.php
+++ b/library/HTMLPurifier/URIScheme/ftp.php
diff --cc library/HTMLPurifier/URIScheme/http.php
index b097a31d6a,b097a31d6a..b097a31d6a
mode 100755,100755..100644
--- a/library/HTMLPurifier/URIScheme/http.php
+++ b/library/HTMLPurifier/URIScheme/http.php
diff --cc library/HTMLPurifier/URIScheme/https.php
index 29e380919f,29e380919f..29e380919f
mode 100755,100755..100644
--- a/library/HTMLPurifier/URIScheme/https.php
+++ b/library/HTMLPurifier/URIScheme/https.php
diff --cc library/HTMLPurifier/URIScheme/mailto.php
index c1e2cd5aae,c1e2cd5aae..c1e2cd5aae
mode 100755,100755..100644
--- a/library/HTMLPurifier/URIScheme/mailto.php
+++ b/library/HTMLPurifier/URIScheme/mailto.php
diff --cc library/HTMLPurifier/URIScheme/news.php
index f5f54f4f56,f5f54f4f56..f5f54f4f56
mode 100755,100755..100644
--- a/library/HTMLPurifier/URIScheme/news.php
+++ b/library/HTMLPurifier/URIScheme/news.php
diff --cc library/HTMLPurifier/URIScheme/nntp.php
index 5bf93ea784,5bf93ea784..5bf93ea784
mode 100755,100755..100644
--- a/library/HTMLPurifier/URIScheme/nntp.php
+++ b/library/HTMLPurifier/URIScheme/nntp.php
diff --cc library/HTMLPurifier/URISchemeRegistry.php
index 576bf7b6d1,576bf7b6d1..576bf7b6d1
mode 100755,100755..100644
--- a/library/HTMLPurifier/URISchemeRegistry.php
+++ b/library/HTMLPurifier/URISchemeRegistry.php
diff --cc library/HTMLPurifier/UnitConverter.php
index 545d426220,545d426220..545d426220
mode 100755,100755..100644
--- a/library/HTMLPurifier/UnitConverter.php
+++ b/library/HTMLPurifier/UnitConverter.php
diff --cc library/HTMLPurifier/VarParser.php
index 68e72ae869,68e72ae869..68e72ae869
mode 100755,100755..100644
--- a/library/HTMLPurifier/VarParser.php
+++ b/library/HTMLPurifier/VarParser.php
diff --cc library/HTMLPurifier/VarParser/Flexible.php
index c954250e9f,c954250e9f..c954250e9f
mode 100755,100755..100644
--- a/library/HTMLPurifier/VarParser/Flexible.php
+++ b/library/HTMLPurifier/VarParser/Flexible.php
diff --cc library/HTMLPurifier/VarParser/Native.php
index b02a6de54c,b02a6de54c..b02a6de54c
mode 100755,100755..100644
--- a/library/HTMLPurifier/VarParser/Native.php
+++ b/library/HTMLPurifier/VarParser/Native.php
diff --cc library/HTMLPurifier/VarParserException.php
index 5df3414959,5df3414959..5df3414959
mode 100755,100755..100644
--- a/library/HTMLPurifier/VarParserException.php
+++ b/library/HTMLPurifier/VarParserException.php
diff --cc library/OAuth1.php
index 0db6fabcbe,0db6fabcbe..0db6fabcbe
mode 100755,100755..100644
--- a/library/OAuth1.php
+++ b/library/OAuth1.php
diff --cc library/asn1.php
index e84398bf62,e84398bf62..e84398bf62
mode 100755,100755..100644
--- a/library/asn1.php
+++ b/library/asn1.php
diff --cc library/cropper/cropper.css
index c2e759818a,c2e759818a..c2e759818a
mode 100755,100755..100644
--- a/library/cropper/cropper.css
+++ b/library/cropper/cropper.css
diff --cc library/cropper/cropper.html
index 2362352474,2362352474..2362352474
mode 100755,100755..100644
--- a/library/cropper/cropper.html
+++ b/library/cropper/cropper.html
diff --cc library/cropper/cropper.js
index 486a92ad91,486a92ad91..486a92ad91
mode 100755,100755..100644
--- a/library/cropper/cropper.js
+++ b/library/cropper/cropper.js
diff --cc library/cropper/cropper.uncompressed.js
index 66185546e2,66185546e2..66185546e2
mode 100755,100755..100644
--- a/library/cropper/cropper.uncompressed.js
+++ b/library/cropper/cropper.uncompressed.js
diff --cc library/cropper/lib/builder.js
index 5b15ba9397,5b15ba9397..5b15ba9397
mode 100755,100755..100644
--- a/library/cropper/lib/builder.js
+++ b/library/cropper/lib/builder.js
diff --cc library/cropper/lib/controls.js
index de0261ed54,de0261ed54..de0261ed54
mode 100755,100755..100644
--- a/library/cropper/lib/controls.js
+++ b/library/cropper/lib/controls.js
diff --cc library/cropper/lib/dragdrop.js
index be2a30f538,be2a30f538..be2a30f538
mode 100755,100755..100644
--- a/library/cropper/lib/dragdrop.js
+++ b/library/cropper/lib/dragdrop.js
diff --cc library/cropper/lib/effects.js
index 0864323ecd,0864323ecd..0864323ecd
mode 100755,100755..100644
--- a/library/cropper/lib/effects.js
+++ b/library/cropper/lib/effects.js
diff --cc library/cropper/lib/prototype.js
index 0caf9cd7f0,0caf9cd7f0..0caf9cd7f0
mode 100755,100755..100644
--- a/library/cropper/lib/prototype.js
+++ b/library/cropper/lib/prototype.js
diff --cc library/cropper/lib/scriptaculous.js
index f61fc57f74,f61fc57f74..f61fc57f74
mode 100755,100755..100644
--- a/library/cropper/lib/scriptaculous.js
+++ b/library/cropper/lib/scriptaculous.js
diff --cc library/cropper/lib/slider.js
index c0f1fc01bb,c0f1fc01bb..c0f1fc01bb
mode 100755,100755..100644
--- a/library/cropper/lib/slider.js
+++ b/library/cropper/lib/slider.js
diff --cc library/cropper/lib/unittest.js
index d2c2d8171d,d2c2d8171d..d2c2d8171d
mode 100755,100755..100644
--- a/library/cropper/lib/unittest.js
+++ b/library/cropper/lib/unittest.js
diff --cc library/cropper/licence.txt
index b59e029176,b59e029176..b59e029176
mode 100755,100755..100644
--- a/library/cropper/licence.txt
+++ b/library/cropper/licence.txt
diff --cc library/cropper/marqueeHoriz.gif
index 25317e5738,25317e5738..25317e5738
mode 100755,100755..100644
Binary files differ
diff --cc library/cropper/marqueeVert.gif
index 354070bb45,354070bb45..354070bb45
mode 100755,100755..100644
Binary files differ
diff --cc library/cropper/tests/castle.jpg
index e40b7e4cbb,e40b7e4cbb..e40b7e4cbb
mode 100755,100755..100644
Binary files differ
diff --cc library/cropper/tests/castleMed.jpg
index c35a6f554a,c35a6f554a..c35a6f554a
mode 100755,100755..100644
Binary files differ
diff --cc library/cropper/tests/example-Basic.htm
index 391c2ecdbc,391c2ecdbc..391c2ecdbc
mode 100755,100755..100644
--- a/library/cropper/tests/example-Basic.htm
+++ b/library/cropper/tests/example-Basic.htm
diff --cc library/cropper/tests/example-CSS-Absolute.htm
index 17e4c489d3,17e4c489d3..17e4c489d3
mode 100755,100755..100644
--- a/library/cropper/tests/example-CSS-Absolute.htm
+++ b/library/cropper/tests/example-CSS-Absolute.htm
diff --cc library/cropper/tests/example-CSS-Float.htm
index 5066553fef,5066553fef..5066553fef
mode 100755,100755..100644
--- a/library/cropper/tests/example-CSS-Float.htm
+++ b/library/cropper/tests/example-CSS-Float.htm
diff --cc library/cropper/tests/example-CSS-Relative.htm
index 5894fe1f9f,5894fe1f9f..5894fe1f9f
mode 100755,100755..100644
--- a/library/cropper/tests/example-CSS-Relative.htm
+++ b/library/cropper/tests/example-CSS-Relative.htm
diff --cc library/cropper/tests/example-CoordsOnLoad.htm
index 254a23472d,254a23472d..254a23472d
mode 100755,100755..100644
--- a/library/cropper/tests/example-CoordsOnLoad.htm
+++ b/library/cropper/tests/example-CoordsOnLoad.htm
diff --cc library/cropper/tests/example-CoordsOnLoadWithRatio.htm
index 3a696360a8,3a696360a8..3a696360a8
mode 100755,100755..100644
--- a/library/cropper/tests/example-CoordsOnLoadWithRatio.htm
+++ b/library/cropper/tests/example-CoordsOnLoadWithRatio.htm
diff --cc library/cropper/tests/example-Dimensions.htm
index f54f996839,f54f996839..f54f996839
mode 100755,100755..100644
--- a/library/cropper/tests/example-Dimensions.htm
+++ b/library/cropper/tests/example-Dimensions.htm
diff --cc library/cropper/tests/example-DynamicImage.htm
index 898363489e,898363489e..898363489e
mode 100755,100755..100644
--- a/library/cropper/tests/example-DynamicImage.htm
+++ b/library/cropper/tests/example-DynamicImage.htm
diff --cc library/cropper/tests/example-FixedRatio.htm
index 973bedda9a,973bedda9a..973bedda9a
mode 100755,100755..100644
--- a/library/cropper/tests/example-FixedRatio.htm
+++ b/library/cropper/tests/example-FixedRatio.htm
diff --cc library/cropper/tests/example-MinimumDimensions.htm
index 3ae93c8e10,3ae93c8e10..3ae93c8e10
mode 100755,100755..100644
--- a/library/cropper/tests/example-MinimumDimensions.htm
+++ b/library/cropper/tests/example-MinimumDimensions.htm
diff --cc library/cropper/tests/example-MinimumWidth.htm
index b0576b87fd,b0576b87fd..b0576b87fd
mode 100755,100755..100644
--- a/library/cropper/tests/example-MinimumWidth.htm
+++ b/library/cropper/tests/example-MinimumWidth.htm
diff --cc library/cropper/tests/example-Preview.htm
index 701670c91c,701670c91c..701670c91c
mode 100755,100755..100644
--- a/library/cropper/tests/example-Preview.htm
+++ b/library/cropper/tests/example-Preview.htm
diff --cc library/cropper/tests/poppy.jpg
index 1f64985844,1f64985844..1f64985844
mode 100755,100755..100644
Binary files differ
diff --cc library/cropper/tests/staticHTMLStructure.htm
index ddb99278e2,ddb99278e2..ddb99278e2
mode 100755,100755..100644
--- a/library/cropper/tests/staticHTMLStructure.htm
+++ b/library/cropper/tests/staticHTMLStructure.htm
diff --cc library/facebook.php
index eebe3b4640,eebe3b4640..eebe3b4640
mode 100755,100755..100644
--- a/library/facebook.php
+++ b/library/facebook.php
diff --cc library/fancybox/blank.gif
index 35d42e808f,35d42e808f..35d42e808f
mode 100755,100755..100644
Binary files differ
diff --cc library/fancybox/fancy_close.png
index 07035307ad,07035307ad..07035307ad
mode 100755,100755..100644
Binary files differ
diff --cc library/fancybox/fancy_loading.png
index 2503017960,2503017960..2503017960
mode 100755,100755..100644
Binary files differ
diff --cc library/fancybox/fancy_nav_left.png
index ebaa6a4fd3,ebaa6a4fd3..ebaa6a4fd3
mode 100755,100755..100644
Binary files differ
diff --cc library/fancybox/fancy_nav_right.png
index 873294e969,873294e969..873294e969
mode 100755,100755..100644
Binary files differ
diff --cc library/fancybox/fancy_shadow_e.png
index 2eda089364,2eda089364..2eda089364
mode 100755,100755..100644
Binary files differ
diff --cc library/fancybox/fancy_shadow_n.png
index 69aa10e233,69aa10e233..69aa10e233
mode 100755,100755..100644
Binary files differ
diff --cc library/fancybox/fancy_shadow_ne.png
index 79f6980a3b,79f6980a3b..79f6980a3b
mode 100755,100755..100644
Binary files differ
diff --cc library/fancybox/fancy_shadow_nw.png
index 7182cd938a,7182cd938a..7182cd938a
mode 100755,100755..100644
Binary files differ
diff --cc library/fancybox/fancy_shadow_s.png
index d8858bfb78,d8858bfb78..d8858bfb78
mode 100755,100755..100644
Binary files differ
diff --cc library/fancybox/fancy_shadow_se.png
index 541e3ffd3e,541e3ffd3e..541e3ffd3e
mode 100755,100755..100644
Binary files differ
diff --cc library/fancybox/fancy_shadow_sw.png
index b451689fa7,b451689fa7..b451689fa7
mode 100755,100755..100644
Binary files differ
diff --cc library/fancybox/fancy_shadow_w.png
index 8a4e4a887f,8a4e4a887f..8a4e4a887f
mode 100755,100755..100644
Binary files differ
diff --cc library/fancybox/fancy_title_left.png
index 6049223d1e,6049223d1e..6049223d1e
mode 100755,100755..100644
Binary files differ
diff --cc library/fancybox/fancy_title_main.png
index 8044271f29,8044271f29..8044271f29
mode 100755,100755..100644
Binary files differ
diff --cc library/fancybox/fancy_title_over.png
index d9f458f4bb,d9f458f4bb..d9f458f4bb
mode 100755,100755..100644
Binary files differ
diff --cc library/fancybox/fancy_title_right.png
index e36d9db2a7,e36d9db2a7..e36d9db2a7
mode 100755,100755..100644
Binary files differ
diff --cc library/fancybox/fancybox-x.png
index c2130f8698,c2130f8698..c2130f8698
mode 100755,100755..100644
Binary files differ
diff --cc library/fancybox/fancybox-y.png
index 7ef399b990,7ef399b990..7ef399b990
mode 100755,100755..100644
Binary files differ
diff --cc library/fancybox/fancybox.png
index 65e14f68fd,65e14f68fd..65e14f68fd
mode 100755,100755..100644
Binary files differ
diff --cc library/fancybox/jquery.easing-1.3.pack.js
index 9028179e7b,9028179e7b..9028179e7b
mode 100755,100755..100644
--- a/library/fancybox/jquery.easing-1.3.pack.js
+++ b/library/fancybox/jquery.easing-1.3.pack.js
diff --cc library/fancybox/jquery.fancybox-1.3.4.css
index 6f53d8f4a2,6f53d8f4a2..6f53d8f4a2
mode 100755,100755..100644
--- a/library/fancybox/jquery.fancybox-1.3.4.css
+++ b/library/fancybox/jquery.fancybox-1.3.4.css
diff --cc library/fancybox/jquery.fancybox-1.3.4.js
index be77275376,be77275376..be77275376
mode 100755,100755..100644
--- a/library/fancybox/jquery.fancybox-1.3.4.js
+++ b/library/fancybox/jquery.fancybox-1.3.4.js
diff --cc library/fancybox/jquery.fancybox-1.3.4.pack.js
index 1373ed0838,1373ed0838..1373ed0838
mode 100755,100755..100644
--- a/library/fancybox/jquery.fancybox-1.3.4.pack.js
+++ b/library/fancybox/jquery.fancybox-1.3.4.pack.js
diff --cc library/fancybox/jquery.mousewheel-3.0.4.pack.js
index cb66588e29,cb66588e29..cb66588e29
mode 100755,100755..100644
--- a/library/fancybox/jquery.mousewheel-3.0.4.pack.js
+++ b/library/fancybox/jquery.mousewheel-3.0.4.pack.js
diff --cc library/jgrowl/README
index 3c94f75087,3c94f75087..3c94f75087
mode 100755,100755..100644
--- a/library/jgrowl/README
+++ b/library/jgrowl/README
diff --cc library/jgrowl/jquery.jgrowl.css
index b4deb978c2,b4deb978c2..b4deb978c2
mode 100755,100755..100644
--- a/library/jgrowl/jquery.jgrowl.css
+++ b/library/jgrowl/jquery.jgrowl.css
diff --cc library/jgrowl/jquery.jgrowl_minimized.js
index 7828980982,7828980982..7828980982
mode 100755,100755..100644
--- a/library/jgrowl/jquery.jgrowl_minimized.js
+++ b/library/jgrowl/jquery.jgrowl_minimized.js
diff --cc library/mcefixes/plugins.bbcode.editor_plugin_src.js
index 183f2bc68d,a2829a21c1..a2829a21c1
mode 100755,100755..100644
--- a/library/mcefixes/plugins.bbcode.editor_plugin_src.js
+++ b/library/mcefixes/plugins.bbcode.editor_plugin_src.js
diff --cc library/mcefixes/themes.advanced.img.icons.gif
index efb356c417,efb356c417..efb356c417
mode 100755,100755..100644
Binary files differ
diff --cc library/mcefixes/themes.advanced.skins.default.dialog.css
index f01222650e,f01222650e..f01222650e
mode 100755,100755..100644
--- a/library/mcefixes/themes.advanced.skins.default.dialog.css
+++ b/library/mcefixes/themes.advanced.skins.default.dialog.css
diff --cc library/mcefixes/themes.advanced.skins.default.ui.css
index 5f1f96448c,5f1f96448c..5f1f96448c
mode 100755,100755..100644
--- a/library/mcefixes/themes.advanced.skins.default.ui.css
+++ b/library/mcefixes/themes.advanced.skins.default.ui.css
diff --cc library/oauth.php
index caf1a08395,caf1a08395..caf1a08395
mode 100755,100755..100644
--- a/library/oauth.php
+++ b/library/oauth.php
diff --cc library/oauth2-php/CHANGELOG.txt
index d854598b60,d854598b60..d854598b60
mode 100755,100755..100644
--- a/library/oauth2-php/CHANGELOG.txt
+++ b/library/oauth2-php/CHANGELOG.txt
diff --cc library/oauth2-php/LICENSE.txt
index 7979b1c858,7979b1c858..7979b1c858
mode 100755,100755..100644
--- a/library/oauth2-php/LICENSE.txt
+++ b/library/oauth2-php/LICENSE.txt
diff --cc library/oauth2-php/lib/OAuth2.inc
index e10e0f26da,e10e0f26da..e10e0f26da
mode 100755,100755..100644
--- a/library/oauth2-php/lib/OAuth2.inc
+++ b/library/oauth2-php/lib/OAuth2.inc
diff --cc library/oauth2-php/lib/OAuth2Client.inc
index e87d723dec,e87d723dec..e87d723dec
mode 100755,100755..100644
--- a/library/oauth2-php/lib/OAuth2Client.inc
+++ b/library/oauth2-php/lib/OAuth2Client.inc
diff --cc library/oauth2-php/lib/OAuth2Exception.inc
index 8dc0469749,8dc0469749..8dc0469749
mode 100755,100755..100644
--- a/library/oauth2-php/lib/OAuth2Exception.inc
+++ b/library/oauth2-php/lib/OAuth2Exception.inc
diff --cc library/openid.php
index 3c58beb8a5,3c58beb8a5..3c58beb8a5
mode 100755,100755..100644
--- a/library/openid.php
+++ b/library/openid.php
diff --cc library/phpsec/Crypt/AES.php
index 681800a81f,681800a81f..681800a81f
mode 100755,100755..100644
--- a/library/phpsec/Crypt/AES.php
+++ b/library/phpsec/Crypt/AES.php
diff --cc library/phpsec/Crypt/DES.php
index 431ad539b3,431ad539b3..431ad539b3
mode 100755,100755..100644
--- a/library/phpsec/Crypt/DES.php
+++ b/library/phpsec/Crypt/DES.php
diff --cc library/phpsec/Crypt/Hash.php
index ef3a858026,ef3a858026..ef3a858026
mode 100755,100755..100644
--- a/library/phpsec/Crypt/Hash.php
+++ b/library/phpsec/Crypt/Hash.php
diff --cc library/phpsec/Crypt/RC4.php
index 6f82b2413a,6f82b2413a..6f82b2413a
mode 100755,100755..100644
--- a/library/phpsec/Crypt/RC4.php
+++ b/library/phpsec/Crypt/RC4.php
diff --cc library/phpsec/Crypt/RSA.php
index 1c562082b9,1c562082b9..1c562082b9
mode 100755,100755..100644
--- a/library/phpsec/Crypt/RSA.php
+++ b/library/phpsec/Crypt/RSA.php
diff --cc library/phpsec/Crypt/Random.php
index a91c4d3c5a,a91c4d3c5a..a91c4d3c5a
mode 100755,100755..100644
--- a/library/phpsec/Crypt/Random.php
+++ b/library/phpsec/Crypt/Random.php
diff --cc library/phpsec/Crypt/Rijndael.php
index f141f3762c,f141f3762c..f141f3762c
mode 100755,100755..100644
--- a/library/phpsec/Crypt/Rijndael.php
+++ b/library/phpsec/Crypt/Rijndael.php
diff --cc library/phpsec/Crypt/TripleDES.php
index 4d0dbbca0a,4d0dbbca0a..4d0dbbca0a
mode 100755,100755..100644
--- a/library/phpsec/Crypt/TripleDES.php
+++ b/library/phpsec/Crypt/TripleDES.php
diff --cc library/phpsec/Math/BigInteger.php
index 5b3a4fc8b9,5b3a4fc8b9..5b3a4fc8b9
mode 100755,100755..100644
--- a/library/phpsec/Math/BigInteger.php
+++ b/library/phpsec/Math/BigInteger.php
diff --cc library/phpsec/Net/SFTP.php
index 06812ada35,06812ada35..06812ada35
mode 100755,100755..100644
--- a/library/phpsec/Net/SFTP.php
+++ b/library/phpsec/Net/SFTP.php
diff --cc library/phpsec/Net/SSH1.php
index 7220ee4023,7220ee4023..7220ee4023
mode 100755,100755..100644
--- a/library/phpsec/Net/SSH1.php
+++ b/library/phpsec/Net/SSH1.php
diff --cc library/phpsec/Net/SSH2.php
index aa9f6dbe52,aa9f6dbe52..aa9f6dbe52
mode 100755,100755..100644
--- a/library/phpsec/Net/SSH2.php
+++ b/library/phpsec/Net/SSH2.php
diff --cc library/phpsec/PHP/Compat/Function/array_fill.php
index e02bfa14d8,e02bfa14d8..e02bfa14d8
mode 100755,100755..100644
--- a/library/phpsec/PHP/Compat/Function/array_fill.php
+++ b/library/phpsec/PHP/Compat/Function/array_fill.php
diff --cc library/phpsec/PHP/Compat/Function/bcpowmod.php
index 6ec1b1840c,6ec1b1840c..6ec1b1840c
mode 100755,100755..100644
--- a/library/phpsec/PHP/Compat/Function/bcpowmod.php
+++ b/library/phpsec/PHP/Compat/Function/bcpowmod.php
diff --cc library/phpsec/PHP/Compat/Function/str_split.php
index 8e38bdb894,8e38bdb894..8e38bdb894
mode 100755,100755..100644
--- a/library/phpsec/PHP/Compat/Function/str_split.php
+++ b/library/phpsec/PHP/Compat/Function/str_split.php
diff --cc library/phpsec/crypt.html
index 6720cf7891,6720cf7891..6720cf7891
mode 100755,100755..100644
--- a/library/phpsec/crypt.html
+++ b/library/phpsec/crypt.html
diff --cc library/phpsec/docbook.css
index 4f67aa4cda,4f67aa4cda..4f67aa4cda
mode 100755,100755..100644
--- a/library/phpsec/docbook.css
+++ b/library/phpsec/docbook.css
diff --cc library/phpsec/index.html
index 6dda0f3699,6dda0f3699..6dda0f3699
mode 100755,100755..100644
--- a/library/phpsec/index.html
+++ b/library/phpsec/index.html
diff --cc library/phpsec/intro.html
index 406b22fc59,406b22fc59..406b22fc59
mode 100755,100755..100644
--- a/library/phpsec/intro.html
+++ b/library/phpsec/intro.html
diff --cc library/phpsec/math.html
index 4e5a14a547,4e5a14a547..4e5a14a547
mode 100755,100755..100644
--- a/library/phpsec/math.html
+++ b/library/phpsec/math.html
diff --cc library/phpsec/misc_crypt.html
index 9751ddac8a,9751ddac8a..9751ddac8a
mode 100755,100755..100644
--- a/library/phpsec/misc_crypt.html
+++ b/library/phpsec/misc_crypt.html
diff --cc library/phpsec/net.html
index 2752b826d4,2752b826d4..2752b826d4
mode 100755,100755..100644
--- a/library/phpsec/net.html
+++ b/library/phpsec/net.html
diff --cc library/phpsec/sym_crypt.html
index 956506290c,956506290c..956506290c
mode 100755,100755..100644
--- a/library/phpsec/sym_crypt.html
+++ b/library/phpsec/sym_crypt.html
diff --cc library/simplepie/LICENSE.txt
index a822a4bd98,a822a4bd98..a822a4bd98
mode 100755,100755..100644
--- a/library/simplepie/LICENSE.txt
+++ b/library/simplepie/LICENSE.txt
diff --cc library/simplepie/README.markdown
index e5ca021ced,e5ca021ced..e5ca021ced
mode 100755,100755..100644
--- a/library/simplepie/README.markdown
+++ b/library/simplepie/README.markdown
diff --cc library/simplepie/compatibility_test/COMPATIBILITY README.txt
index 5b24989927,5b24989927..5b24989927
mode 100755,100755..100644
--- a/library/simplepie/compatibility_test/COMPATIBILITY README.txt
+++ b/library/simplepie/compatibility_test/COMPATIBILITY README.txt
diff --cc library/simplepie/compatibility_test/sp_compatibility_test.php
index a7a7f5fde2,a7a7f5fde2..a7a7f5fde2
mode 100755,100755..100644
--- a/library/simplepie/compatibility_test/sp_compatibility_test.php
+++ b/library/simplepie/compatibility_test/sp_compatibility_test.php
diff --cc library/simplepie/create.php
index 908ed182bd,908ed182bd..908ed182bd
mode 100755,100755..100644
--- a/library/simplepie/create.php
+++ b/library/simplepie/create.php
diff --cc library/simplepie/db.sql
index 13f504c214,13f504c214..13f504c214
mode 100755,100755..100644
--- a/library/simplepie/db.sql
+++ b/library/simplepie/db.sql
diff --cc library/simplepie/demo/cli_test.php
index ec933c5ad7,ec933c5ad7..ec933c5ad7
mode 100755,100755..100644
--- a/library/simplepie/demo/cli_test.php
+++ b/library/simplepie/demo/cli_test.php
diff --cc library/simplepie/demo/for_the_demo/alternate_favicon.png
index 063fb28054,063fb28054..063fb28054
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/background_blockquote.png
index 8267e23a23,8267e23a23..8267e23a23
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/background_menuitem.gif
index fa765d670e,fa765d670e..fa765d670e
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/background_menuitem_off.gif
index 236cf406dc,236cf406dc..236cf406dc
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/background_menuitem_shadow.gif
index 95cfb820d4,95cfb820d4..95cfb820d4
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/favicons/alternate.png
index 063fb28054,063fb28054..063fb28054
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/favicons/blinklist.png
index 53200b3c62,53200b3c62..53200b3c62
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/favicons/blogmarks.png
index c5372614a4,c5372614a4..c5372614a4
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/favicons/delicious.png
index 2e6021d26e,2e6021d26e..2e6021d26e
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/favicons/digg.png
index 3aa96770e8,3aa96770e8..3aa96770e8
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/favicons/magnolia.png
index da519f5ab9,da519f5ab9..da519f5ab9
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/favicons/myweb2.png
index 2a12968d5e,2a12968d5e..2a12968d5e
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/favicons/newsvine.png
index 5cdbb31c69,5cdbb31c69..5cdbb31c69
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/favicons/reddit.png
index 65c38867cd,65c38867cd..65c38867cd
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/favicons/segnalo.png
index 748149b371,748149b371..748149b371
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/favicons/simpy.png
index 30b23c1a55,30b23c1a55..30b23c1a55
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/favicons/spurl.png
index f5be3963dc,f5be3963dc..f5be3963dc
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/favicons/technorati.png
index 0f19e824e6,0f19e824e6..0f19e824e6
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/favicons/wists.png
index 2e2d294d1e,2e2d294d1e..2e2d294d1e
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/feed.png
index e23c50c85b,e23c50c85b..e23c50c85b
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/logo_simplepie_demo.png
index eda2d868b5,eda2d868b5..eda2d868b5
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/lucida-grande-bold.swf
index 0a41e15eb8,0a41e15eb8..0a41e15eb8
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/mediaplayer.swf
index bf78fd919a,bf78fd919a..bf78fd919a
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/mediaplayer_readme.htm
index 56e12c309e,56e12c309e..56e12c309e
mode 100755,100755..100644
--- a/library/simplepie/demo/for_the_demo/mediaplayer_readme.htm
+++ b/library/simplepie/demo/for_the_demo/mediaplayer_readme.htm
diff --cc library/simplepie/demo/for_the_demo/mini_podcast.png
index fd6faf2a31,fd6faf2a31..fd6faf2a31
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/place_audio.png
index 560ea00393,560ea00393..560ea00393
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/place_video.png
index be5ec8219e,be5ec8219e..be5ec8219e
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/sIFR-print.css
index ec89b1961e,ec89b1961e..ec89b1961e
mode 100755,100755..100644
--- a/library/simplepie/demo/for_the_demo/sIFR-print.css
+++ b/library/simplepie/demo/for_the_demo/sIFR-print.css
diff --cc library/simplepie/demo/for_the_demo/sIFR-screen.css
index 778e09d2b6,778e09d2b6..778e09d2b6
mode 100755,100755..100644
--- a/library/simplepie/demo/for_the_demo/sIFR-screen.css
+++ b/library/simplepie/demo/for_the_demo/sIFR-screen.css
diff --cc library/simplepie/demo/for_the_demo/sifr-config.js
index e7066b3613,e7066b3613..e7066b3613
mode 100755,100755..100644
--- a/library/simplepie/demo/for_the_demo/sifr-config.js
+++ b/library/simplepie/demo/for_the_demo/sifr-config.js
diff --cc library/simplepie/demo/for_the_demo/sifr.js
index 0a8b1b6dc0,0a8b1b6dc0..0a8b1b6dc0
mode 100755,100755..100644
--- a/library/simplepie/demo/for_the_demo/sifr.js
+++ b/library/simplepie/demo/for_the_demo/sifr.js
diff --cc library/simplepie/demo/for_the_demo/simplepie.css
index 3753cb96de,3753cb96de..3753cb96de
mode 100755,100755..100644
--- a/library/simplepie/demo/for_the_demo/simplepie.css
+++ b/library/simplepie/demo/for_the_demo/simplepie.css
diff --cc library/simplepie/demo/for_the_demo/sleight.js
index 4b5058e9a6,4b5058e9a6..4b5058e9a6
mode 100755,100755..100644
--- a/library/simplepie/demo/for_the_demo/sleight.js
+++ b/library/simplepie/demo/for_the_demo/sleight.js
diff --cc library/simplepie/demo/for_the_demo/source_files/place_audio_fireworksfile.png
index 2bfd87d0ce,2bfd87d0ce..2bfd87d0ce
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/source_files/place_video_fireworksfile.png
index d0629769cf,d0629769cf..d0629769cf
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/source_files/sIFR-r245/SifrStyleSheet.as
index 6a98ca5522,6a98ca5522..6a98ca5522
mode 100755,100755..100644
--- a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/SifrStyleSheet.as
+++ b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/SifrStyleSheet.as
diff --cc library/simplepie/demo/for_the_demo/source_files/sIFR-r245/_README_.txt
index 2b9d32d202,2b9d32d202..2b9d32d202
mode 100755,100755..100644
--- a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/_README_.txt
+++ b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/_README_.txt
diff --cc library/simplepie/demo/for_the_demo/source_files/sIFR-r245/options.as
index 4d371954bc,4d371954bc..4d371954bc
mode 100755,100755..100644
--- a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/options.as
+++ b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/options.as
diff --cc library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sIFR.as
index 4902e003f3,4902e003f3..4902e003f3
mode 100755,100755..100644
--- a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sIFR.as
+++ b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sIFR.as
diff --cc library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sifr.fla
index 2aa3f647f4,2aa3f647f4..2aa3f647f4
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/top_gradient.gif
index f77bd38f97,f77bd38f97..f77bd38f97
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/verdana.swf
index baf0350473,baf0350473..baf0350473
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/for_the_demo/yanone-kaffeesatz-bold.swf
index c812a79dcf,c812a79dcf..c812a79dcf
mode 100755,100755..100644
Binary files differ
diff --cc library/simplepie/demo/handler_image.php
index 49c3ec89b2,49c3ec89b2..49c3ec89b2
mode 100755,100755..100644
--- a/library/simplepie/demo/handler_image.php
+++ b/library/simplepie/demo/handler_image.php
diff --cc library/simplepie/demo/index.php
index 1481ba9172,1481ba9172..1481ba9172
mode 100755,100755..100644
--- a/library/simplepie/demo/index.php
+++ b/library/simplepie/demo/index.php
diff --cc library/simplepie/demo/minimalistic.php
index 56509c00cb,56509c00cb..56509c00cb
mode 100755,100755..100644
--- a/library/simplepie/demo/minimalistic.php
+++ b/library/simplepie/demo/minimalistic.php
diff --cc library/simplepie/demo/multifeeds.php
index b23d792a2f,b23d792a2f..b23d792a2f
mode 100755,100755..100644
--- a/library/simplepie/demo/multifeeds.php
+++ b/library/simplepie/demo/multifeeds.php
diff --cc library/simplepie/demo/test.php
index 5b9943abbc,5b9943abbc..5b9943abbc
mode 100755,100755..100644
--- a/library/simplepie/demo/test.php
+++ b/library/simplepie/demo/test.php
diff --cc library/simplepie/idn/LICENCE
index 25a1d22dfe,25a1d22dfe..25a1d22dfe
mode 100755,100755..100644
--- a/library/simplepie/idn/LICENCE
+++ b/library/simplepie/idn/LICENCE
diff --cc library/simplepie/idn/ReadMe.txt
index 7ca8c7e6de,7ca8c7e6de..7ca8c7e6de
mode 100755,100755..100644
--- a/library/simplepie/idn/ReadMe.txt
+++ b/library/simplepie/idn/ReadMe.txt
diff --cc library/simplepie/idn/idna_convert.class.php
index ed2bae26db,ed2bae26db..ed2bae26db
mode 100755,100755..100644
--- a/library/simplepie/idn/idna_convert.class.php
+++ b/library/simplepie/idn/idna_convert.class.php
diff --cc library/simplepie/idn/npdata.ser
index d7ce6d03f2,d7ce6d03f2..d7ce6d03f2
mode 100755,100755..100644
--- a/library/simplepie/idn/npdata.ser
+++ b/library/simplepie/idn/npdata.ser
diff --cc library/simplepie/simplepie.inc
index 8a2739f525,8a2739f525..8a2739f525
mode 100755,100755..100644
--- a/library/simplepie/simplepie.inc
+++ b/library/simplepie/simplepie.inc
diff --cc library/slinky.php
index cae1f755ff,cae1f755ff..cae1f755ff
mode 100755,100755..100644
--- a/library/slinky.php
+++ b/library/slinky.php
diff --cc library/tiptip/README
index a83cfba3ed,a83cfba3ed..a83cfba3ed
mode 100755,100755..100644
--- a/library/tiptip/README
+++ b/library/tiptip/README
diff --cc library/tiptip/README.txt
index 740d11a50e,740d11a50e..740d11a50e
mode 100755,100755..100644
--- a/library/tiptip/README.txt
+++ b/library/tiptip/README.txt
diff --cc library/tiptip/jquery.tipTip.js
index a05315dd7e,a05315dd7e..a05315dd7e
mode 100755,100755..100644
--- a/library/tiptip/jquery.tipTip.js
+++ b/library/tiptip/jquery.tipTip.js
diff --cc library/tiptip/jquery.tipTip.minified.js
index 79e58f7ade,79e58f7ade..79e58f7ade
mode 100755,100755..100644
--- a/library/tiptip/jquery.tipTip.minified.js
+++ b/library/tiptip/jquery.tipTip.minified.js
diff --cc library/tiptip/tipTip.css
index 4fb95d3769,4fb95d3769..4fb95d3769
mode 100755,100755..100644
--- a/library/tiptip/tipTip.css
+++ b/library/tiptip/tipTip.css
diff --cc library/twitteroauth.php
index 7f3dcba4d7,7f3dcba4d7..7f3dcba4d7
mode 100755,100755..100644
--- a/library/twitteroauth.php
+++ b/library/twitteroauth.php
diff --cc mod/acl.php
index 375c618c86,fe353d1eb5..fe353d1eb5
mode 100755,100755..100644
--- a/mod/acl.php
+++ b/mod/acl.php
diff --cc mod/admin.php
index a64b269035,a395027c11..a395027c11
mode 100755,100755..100644
--- a/mod/admin.php
+++ b/mod/admin.php
diff --cc mod/allfriends.php
index f675b8e29c,f675b8e29c..f675b8e29c
mode 100755,100755..100644
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
diff --cc mod/amcd.php
index a2a1327e6d,a2a1327e6d..a2a1327e6d
mode 100755,100755..100644
--- a/mod/amcd.php
+++ b/mod/amcd.php
diff --cc mod/api.php
index ad75e6620e,ad75e6620e..ad75e6620e
mode 100755,100755..100644
--- a/mod/api.php
+++ b/mod/api.php
diff --cc mod/apps.php
index 8049b45fb3,8049b45fb3..8049b45fb3
mode 100755,100755..100644
--- a/mod/apps.php
+++ b/mod/apps.php
diff --cc mod/attach.php
index ae6540201e,ae6540201e..ae6540201e
mode 100755,100755..100644
--- a/mod/attach.php
+++ b/mod/attach.php
diff --cc mod/cb.php
index 6375d23984,6375d23984..6375d23984
mode 100755,100755..100644
--- a/mod/cb.php
+++ b/mod/cb.php
diff --cc mod/common.php
index 852388c149,852388c149..852388c149
mode 100755,100755..100644
--- a/mod/common.php
+++ b/mod/common.php
diff --cc mod/community.php
index f8cc3305b1,f8cc3305b1..f8cc3305b1
mode 100755,100755..100644
--- a/mod/community.php
+++ b/mod/community.php
diff --cc mod/contactgroup.php
index bf81afe079,bf81afe079..bf81afe079
mode 100755,100755..100644
--- a/mod/contactgroup.php
+++ b/mod/contactgroup.php
diff --cc mod/contacts.php
index 8aa51d00ae,8aa51d00ae..8aa51d00ae
mode 100755,100755..100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
diff --cc mod/crepair.php
index ec963b1053,ec963b1053..ec963b1053
mode 100755,100755..100644
--- a/mod/crepair.php
+++ b/mod/crepair.php
diff --cc mod/dfrn_notify.php
index 71860ac3b1,65d39d5fe1..65d39d5fe1
mode 100755,100755..100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
diff --cc mod/dfrn_poll.php
index fe5cd49063,5c27889831..5c27889831
mode 100755,100755..100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
diff --cc mod/dfrn_request.php
index c2d37dac7e,5881b7b51b..5881b7b51b
mode 100755,100755..100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
diff --cc mod/directory.php
index 7f18bd0268,7f18bd0268..7f18bd0268
mode 100755,100755..100644
--- a/mod/directory.php
+++ b/mod/directory.php
diff --cc mod/dirfind.php
index 75b1c49767,34c54dd918..34c54dd918
mode 100755,100755..100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
diff --cc mod/display.php
index 81ed174acc,81ed174acc..81ed174acc
mode 100755,100755..100644
--- a/mod/display.php
+++ b/mod/display.php
diff --cc mod/editpost.php
index 778ac3dccd,4c00201ca8..4c00201ca8
mode 100755,100755..100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
diff --cc mod/events.php
index 0906d16c2e,e66a2dc442..e66a2dc442
mode 100755,100755..100644
--- a/mod/events.php
+++ b/mod/events.php
diff --cc mod/filer.php
index a9e2135361,c0cca9e6df..c0cca9e6df
mode 100755,100755..100644
--- a/mod/filer.php
+++ b/mod/filer.php
diff --cc mod/follow.php
index ae8cb200c7,ae8cb200c7..ae8cb200c7
mode 100755,100755..100644
--- a/mod/follow.php
+++ b/mod/follow.php
diff --cc mod/friendica.php
index ab92e31ed9,52a064224a..52a064224a
mode 100755,100755..100644
--- a/mod/friendica.php
+++ b/mod/friendica.php
diff --cc mod/friendika.php
index 1f3df565d6,1f3df565d6..1f3df565d6
mode 100755,100755..100644
--- a/mod/friendika.php
+++ b/mod/friendika.php
diff --cc mod/fsuggest.php
index 9ef8f4c551,9ef8f4c551..9ef8f4c551
mode 100755,100755..100644
--- a/mod/fsuggest.php
+++ b/mod/fsuggest.php
diff --cc mod/group.php
index a282dbccf5,a282dbccf5..a282dbccf5
mode 100755,100755..100644
--- a/mod/group.php
+++ b/mod/group.php
diff --cc mod/hcard.php
index 6d2d9e2ebf,6d2d9e2ebf..6d2d9e2ebf
mode 100755,100755..100644
--- a/mod/hcard.php
+++ b/mod/hcard.php
diff --cc mod/help.php
index af05bd47c0,af05bd47c0..af05bd47c0
mode 100755,100755..100644
--- a/mod/help.php
+++ b/mod/help.php
diff --cc mod/home.php
index 0320c1b398,0320c1b398..0320c1b398
mode 100755,100755..100644
--- a/mod/home.php
+++ b/mod/home.php
diff --cc mod/hostxrd.php
index fe61a874c3,fe61a874c3..fe61a874c3
mode 100755,100755..100644
--- a/mod/hostxrd.php
+++ b/mod/hostxrd.php
diff --cc mod/install.php
index 003d81c6ab,d1142248a3..d1142248a3
mode 100755,100755..100644
--- a/mod/install.php
+++ b/mod/install.php
diff --cc mod/invite.php
index d4eb9c5ef1,2dbf93c590..2dbf93c590
mode 100755,100755..100644
--- a/mod/invite.php
+++ b/mod/invite.php
diff --cc mod/item.php
index ee6c5c9a73,72e63865bd..72e63865bd
mode 100755,100755..100644
--- a/mod/item.php
+++ b/mod/item.php
diff --cc mod/like.php
index 6b97fafb56,6b97fafb56..6b97fafb56
mode 100755,100755..100644
--- a/mod/like.php
+++ b/mod/like.php
diff --cc mod/localtime.php
index c03eae1b0e,c03eae1b0e..c03eae1b0e
mode 100755,100755..100644
--- a/mod/localtime.php
+++ b/mod/localtime.php
diff --cc mod/lockview.php
index 9e64e2608b,9e64e2608b..9e64e2608b
mode 100755,100755..100644
--- a/mod/lockview.php
+++ b/mod/lockview.php
diff --cc mod/login.php
index 10b4d3001d,10b4d3001d..10b4d3001d
mode 100755,100755..100644
--- a/mod/login.php
+++ b/mod/login.php
diff --cc mod/lostpass.php
index 57e6d69653,57e6d69653..57e6d69653
mode 100755,100755..100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
diff --cc mod/manage.php
index 84dfa6917c,84dfa6917c..84dfa6917c
mode 100755,100755..100644
--- a/mod/manage.php
+++ b/mod/manage.php
diff --cc mod/match.php
index 1ae7848a63,926df1dfff..926df1dfff
mode 100755,100755..100644
--- a/mod/match.php
+++ b/mod/match.php
diff --cc mod/message.php
index 0907abd77f,1369fde2e2..1369fde2e2
mode 100755,100755..100644
--- a/mod/message.php
+++ b/mod/message.php
diff --cc mod/modexp.php
index bba2c2882d,bba2c2882d..bba2c2882d
mode 100755,100755..100644
--- a/mod/modexp.php
+++ b/mod/modexp.php
diff --cc mod/msearch.php
index 94def7d89c,94def7d89c..94def7d89c
mode 100755,100755..100644
--- a/mod/msearch.php
+++ b/mod/msearch.php
diff --cc mod/network.php
index 9ec8c23b59,d27945a860..d27945a860
mode 100755,100755..100644
--- a/mod/network.php
+++ b/mod/network.php
diff --cc mod/newmember.php
index 2ecc890247,683463ecb8..683463ecb8
mode 100755,100755..100644
--- a/mod/newmember.php
+++ b/mod/newmember.php
diff --cc mod/notes.php
index e6e2b44fb0,e6e2b44fb0..e6e2b44fb0
mode 100755,100755..100644
--- a/mod/notes.php
+++ b/mod/notes.php
diff --cc mod/notice.php
index 19cf53189a,19cf53189a..19cf53189a
mode 100755,100755..100644
--- a/mod/notice.php
+++ b/mod/notice.php
diff --cc mod/notifications.php
index ff131010f0,690a99562f..690a99562f
mode 100755,100755..100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
diff --cc mod/oembed.php
index 236625f68a,236625f68a..236625f68a
mode 100755,100755..100644
--- a/mod/oembed.php
+++ b/mod/oembed.php
diff --cc mod/oexchange.php
index bbb436e702,bbb436e702..bbb436e702
mode 100755,100755..100644
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
diff --cc mod/openid.php
index e2cea7d851,e2cea7d851..e2cea7d851
mode 100755,100755..100644
--- a/mod/openid.php
+++ b/mod/openid.php
diff --cc mod/opensearch.php
index ff748d1c53,ff748d1c53..ff748d1c53
mode 100755,100755..100644
--- a/mod/opensearch.php
+++ b/mod/opensearch.php
diff --cc mod/parse_url.php
index 27dac4d5d3,27dac4d5d3..27dac4d5d3
mode 100755,100755..100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
diff --cc mod/photo.php
index 3a70251200,3a70251200..3a70251200
mode 100755,100755..100644
--- a/mod/photo.php
+++ b/mod/photo.php
diff --cc mod/photos.php
index b294f0a666,2a808cb41d..2a808cb41d
mode 100755,100755..100644
--- a/mod/photos.php
+++ b/mod/photos.php
diff --cc mod/poco.php
index 79cf820bcd,acfa3ffaa9..acfa3ffaa9
mode 100755,100755..100644
--- a/mod/poco.php
+++ b/mod/poco.php
diff --cc mod/post.php
index 4a7e33b23b,4a7e33b23b..4a7e33b23b
mode 100755,100755..100644
--- a/mod/post.php
+++ b/mod/post.php
diff --cc mod/probe.php
index c95db291b3,c95db291b3..c95db291b3
mode 100755,100755..100644
--- a/mod/probe.php
+++ b/mod/probe.php
diff --cc mod/profile.php
index 428679ffc5,68d73fba38..68d73fba38
mode 100755,100755..100644
--- a/mod/profile.php
+++ b/mod/profile.php
diff --cc mod/profile_photo.php
index d1fd08eba6,ace8dadd47..ace8dadd47
mode 100755,100755..100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
diff --cc mod/profiles.php
index 7b3b6ccc1e,7b3b6ccc1e..7b3b6ccc1e
mode 100755,100755..100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
diff --cc mod/profperm.php
index 8d09c429cc,8d09c429cc..8d09c429cc
mode 100755,100755..100644
--- a/mod/profperm.php
+++ b/mod/profperm.php
diff --cc mod/pubsub.php
index 93d50ef90e,93d50ef90e..93d50ef90e
mode 100755,100755..100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
diff --cc mod/qsearch.php
index c35e253b67,c35e253b67..c35e253b67
mode 100755,100755..100644
--- a/mod/qsearch.php
+++ b/mod/qsearch.php
diff --cc mod/receive.php
index 950bf0bd38,2bd3cc65bc..2bd3cc65bc
mode 100755,100755..100644
--- a/mod/receive.php
+++ b/mod/receive.php
diff --cc mod/redir.php
index 9223e5483c,9223e5483c..9223e5483c
mode 100755,100755..100644
--- a/mod/redir.php
+++ b/mod/redir.php
diff --cc mod/register.php
index 6d0e2700bc,630c0a6759..630c0a6759
mode 100755,100755..100644
--- a/mod/register.php
+++ b/mod/register.php
diff --cc mod/regmod.php
index 21f41eb01c,21f41eb01c..21f41eb01c
mode 100755,100755..100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
diff --cc mod/removeme.php
index ee88bd76a5,ee88bd76a5..ee88bd76a5
mode 100755,100755..100644
--- a/mod/removeme.php
+++ b/mod/removeme.php
diff --cc mod/rsd_xml.php
index 5bf4663fd5,5bf4663fd5..5bf4663fd5
mode 100755,100755..100644
--- a/mod/rsd_xml.php
+++ b/mod/rsd_xml.php
diff --cc mod/salmon.php
index 6172d17a1d,6172d17a1d..6172d17a1d
mode 100755,100755..100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
diff --cc mod/search.php
index 50e7a6abc7,4ca7db9bb1..4ca7db9bb1
mode 100755,100755..100644
--- a/mod/search.php
+++ b/mod/search.php
diff --cc mod/session.php
index 22c855edba,22c855edba..22c855edba
mode 100755,100755..100644
--- a/mod/session.php
+++ b/mod/session.php
diff --cc mod/settings.php
index 59ede47297,6879da285f..6879da285f
mode 100755,100755..100644
--- a/mod/settings.php
+++ b/mod/settings.php
diff --cc mod/share.php
index 47bb851a4f,6c6098c83c..6c6098c83c
mode 100755,100755..100644
--- a/mod/share.php
+++ b/mod/share.php
diff --cc mod/smilies.php
index c47f95da76,c47f95da76..c47f95da76
mode 100755,100755..100644
--- a/mod/smilies.php
+++ b/mod/smilies.php
diff --cc mod/starred.php
index 035b81e764,035b81e764..035b81e764
mode 100755,100755..100644
--- a/mod/starred.php
+++ b/mod/starred.php
diff --cc mod/suggest.php
index b8ca423c5a,7a86d53a1d..7a86d53a1d
mode 100755,100755..100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
diff --cc mod/tagger.php
index 3ff5d57aa2,3ff5d57aa2..3ff5d57aa2
mode 100755,100755..100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
diff --cc mod/tagrm.php
index 5041145cc3,5041145cc3..5041145cc3
mode 100755,100755..100644
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
diff --cc mod/uexport.php
index e1fb22855a,e1fb22855a..e1fb22855a
mode 100755,100755..100644
--- a/mod/uexport.php
+++ b/mod/uexport.php
diff --cc mod/update_community.php
index 3dcbce6b1f,3dcbce6b1f..3dcbce6b1f
mode 100755,100755..100644
--- a/mod/update_community.php
+++ b/mod/update_community.php
diff --cc mod/update_network.php
index 36de0722a9,36de0722a9..36de0722a9
mode 100755,100755..100644
--- a/mod/update_network.php
+++ b/mod/update_network.php
diff --cc mod/update_notes.php
index 90cc5bc69c,90cc5bc69c..90cc5bc69c
mode 100755,100755..100644
--- a/mod/update_notes.php
+++ b/mod/update_notes.php
diff --cc mod/update_profile.php
index c4884b30f5,c4884b30f5..c4884b30f5
mode 100755,100755..100644
--- a/mod/update_profile.php
+++ b/mod/update_profile.php
diff --cc mod/viewcontacts.php
index 6b66f60d77,e7d26b73e5..e7d26b73e5
mode 100755,100755..100644
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
diff --cc mod/viewsrc.php
index 94847ec7b9,3fa4eaed53..3fa4eaed53
mode 100755,100755..100644
--- a/mod/viewsrc.php
+++ b/mod/viewsrc.php
diff --cc mod/wall_attach.php
index ecf4752915,ecf4752915..ecf4752915
mode 100755,100755..100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
diff --cc mod/wall_upload.php
index 64f174a78e,64f174a78e..64f174a78e
mode 100755,100755..100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
diff --cc mod/webfinger.php
index 74bd2c9543,74bd2c9543..74bd2c9543
mode 100755,100755..100644
--- a/mod/webfinger.php
+++ b/mod/webfinger.php
diff --cc mod/xrd.php
index 2fa6bcd99b,2fa6bcd99b..2fa6bcd99b
mode 100755,100755..100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
diff --cc spec/dfrn-snap2.jpg
index ee00f5654c,ee00f5654c..ee00f5654c
mode 100755,100755..100644
Binary files differ
diff --cc spec/dfrn2.odt
index 390fc4bb85,390fc4bb85..390fc4bb85
mode 100755,100755..100644
Binary files differ
diff --cc spec/dfrn2.pdf
index e46225f7e9,e46225f7e9..e46225f7e9
mode 100755,100755..100644
Binary files differ
diff --cc spec/zot.txt
index 2c3bbb1800,2c3bbb1800..2c3bbb1800
mode 100755,100755..100644
--- a/spec/zot.txt
+++ b/spec/zot.txt
diff --cc testargs.php
index 4c9bce4e93,4c9bce4e93..4c9bce4e93
mode 100755,100755..100644
--- a/testargs.php
+++ b/testargs.php
diff --cc tests/autoname_test.php
index 9dae920ca2,9dae920ca2..9dae920ca2
mode 100755,100755..100644
--- a/tests/autoname_test.php
+++ b/tests/autoname_test.php
diff --cc tests/contains_attribute_test.php
index b0bb06acfa,b0bb06acfa..b0bb06acfa
mode 100755,100755..100644
--- a/tests/contains_attribute_test.php
+++ b/tests/contains_attribute_test.php
diff --cc tests/expand_acl_test.php
index b516a3f14d,b516a3f14d..b516a3f14d
mode 100755,100755..100644
--- a/tests/expand_acl_test.php
+++ b/tests/expand_acl_test.php
diff --cc tests/template_test.php
index 1f9f805313,1f9f805313..1f9f805313
mode 100755,100755..100644
--- a/tests/template_test.php
+++ b/tests/template_test.php
diff --cc update.php
index adb96b8319,d38e39f8b1..ae35d2d50d
mode 100644,100755..100644
--- a/update.php
+++ b/update.php
@@@ -1,6 -1,6 +1,6 @@@
  <?php
  
--define( 'UPDATE_VERSION' , 1134 );
++define( 'UPDATE_VERSION' , 1135 );
  
  /**
   *
@@@ -1137,16 -1137,7 +1137,22 @@@ INDEX ( `username` 
  }
  
  function update_1133() {
 -	q("ALTER TABLE `user` ADD `unkmail` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `blocktags` , ADD INDEX ( `unkmail` ) ");
 -	q("ALTER TABLE `user` ADD `cntunkmail` INT NOT NULL DEFAULT '10' AFTER `unkmail` , ADD INDEX ( `cntunkmail` ) ");
 -	q("ALTER TABLE `mail` ADD `unknown` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `replied` , ADD INDEX ( `unknown` ) ");
++q("ALTER TABLE `user` ADD `unkmail` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `blocktags` , ADD INDEX ( `unkmail` ) ");
++q("ALTER TABLE `user` ADD `cntunkmail` INT NOT NULL DEFAULT '10' AFTER `unkmail` , ADD INDEX ( `cntunkmail` ) ");
++q("ALTER TABLE `mail` ADD `unknown` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `replied` , ADD INDEX ( `unknown` ) ");
++}
++
++function update_1134() {
 +	//there can't be indexes with more than 1000 bytes in mysql, 
 +	//so change charset to be smaller
 +	q("ALTER TABLE `config` CHANGE `cat` `cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL ,
 +CHANGE `k` `k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL"); 
 +	//and add the index
 +	q("ALTER TABLE `friendica`.`config` ADD UNIQUE `access` ( `cat` , `k` ) "); 
 +	
 +	//same thing for pconfig
 +	q("ALTER TABLE `pconfig` CHANGE `cat` `cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL ,
 +	CHANGE `k` `k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL"); 
 +	
 +	q("ALTER TABLE `friendica`.`pconfig` ADD UNIQUE `access` ( `uid` , `cat` , `k` )"); 
  }
diff --cc util/.htaccess
index b311c14c23,b311c14c23..b311c14c23
mode 100755,100755..100644
--- a/util/.htaccess
+++ b/util/.htaccess
diff --cc util/README
index aceade3e23,aceade3e23..aceade3e23
mode 100755,100755..100644
--- a/util/README
+++ b/util/README
diff --cc util/db_update.php
index 35620e80b7,35620e80b7..35620e80b7
mode 100755,100755..100644
--- a/util/db_update.php
+++ b/util/db_update.php
diff --cc util/extract.php
index 90127f3c1b,90127f3c1b..90127f3c1b
mode 100755,100755..100644
--- a/util/extract.php
+++ b/util/extract.php
diff --cc util/messages.po
index 7f88e22884,60c71f7fef..60c71f7fef
mode 100755,100755..100644
--- a/util/messages.po
+++ b/util/messages.po
diff --cc util/php2po.php
index d3ce0a5af5,d3ce0a5af5..d3ce0a5af5
mode 100755,100755..100644
--- a/util/php2po.php
+++ b/util/php2po.php
diff --cc util/po2php.php
index c703172af7,c703172af7..c703172af7
mode 100755,100755..100644
--- a/util/po2php.php
+++ b/util/po2php.php
diff --cc util/run_xgettext.sh
index 6ea603c83c,6ea603c83c..6ea603c83c
mode 100755,100755..100644
--- a/util/run_xgettext.sh
+++ b/util/run_xgettext.sh
diff --cc util/strings.php
index e70766d863,e70766d863..e70766d863
mode 100755,100755..100644
--- a/util/strings.php
+++ b/util/strings.php
diff --cc util/typo.php
index e20cce86a5,e20cce86a5..e20cce86a5
mode 100755,100755..100644
--- a/util/typo.php
+++ b/util/typo.php
diff --cc util/typohelper.php
index 589702a02a,589702a02a..589702a02a
mode 100755,100755..100644
--- a/util/typohelper.php
+++ b/util/typohelper.php
diff --cc view/.htaccess
index 559a5fcc09,559a5fcc09..559a5fcc09
mode 100755,100755..100644
--- a/view/.htaccess
+++ b/view/.htaccess
diff --cc view/404.tpl
index bf4d4e949c,bf4d4e949c..bf4d4e949c
mode 100755,100755..100644
--- a/view/404.tpl
+++ b/view/404.tpl
diff --cc view/admin_aside.tpl
index 4bf7ce9d3a,4bf7ce9d3a..4bf7ce9d3a
mode 100755,100755..100644
--- a/view/admin_aside.tpl
+++ b/view/admin_aside.tpl
diff --cc view/admin_logs.tpl
index 9d133b1553,9d133b1553..9d133b1553
mode 100755,100755..100644
--- a/view/admin_logs.tpl
+++ b/view/admin_logs.tpl
diff --cc view/admin_plugins.tpl
index 8367ff6a1d,8367ff6a1d..8367ff6a1d
mode 100755,100755..100644
--- a/view/admin_plugins.tpl
+++ b/view/admin_plugins.tpl
diff --cc view/admin_plugins_details.tpl
index ead356f5b9,cbaef2d66c..cbaef2d66c
mode 100755,100755..100644
--- a/view/admin_plugins_details.tpl
+++ b/view/admin_plugins_details.tpl
diff --cc view/admin_remoteupdate.tpl
index 874c6e6267,874c6e6267..874c6e6267
mode 100755,100755..100644
--- a/view/admin_remoteupdate.tpl
+++ b/view/admin_remoteupdate.tpl
diff --cc view/admin_site.tpl
index 01fe893c65,01fe893c65..01fe893c65
mode 100755,100755..100644
--- a/view/admin_site.tpl
+++ b/view/admin_site.tpl
diff --cc view/admin_summary.tpl
index eed71fbe0e,eed71fbe0e..eed71fbe0e
mode 100755,100755..100644
--- a/view/admin_summary.tpl
+++ b/view/admin_summary.tpl
diff --cc view/admin_users.tpl
index bde7edb598,bde7edb598..bde7edb598
mode 100755,100755..100644
--- a/view/admin_users.tpl
+++ b/view/admin_users.tpl
diff --cc view/album_edit.tpl
index 56a7b73fcd,56a7b73fcd..56a7b73fcd
mode 100755,100755..100644
--- a/view/album_edit.tpl
+++ b/view/album_edit.tpl
diff --cc view/api_config_xml.tpl
index 3281e59dd3,3281e59dd3..3281e59dd3
mode 100755,100755..100644
--- a/view/api_config_xml.tpl
+++ b/view/api_config_xml.tpl
diff --cc view/api_friends_xml.tpl
index 0ea7eb13b7,0ea7eb13b7..0ea7eb13b7
mode 100755,100755..100644
--- a/view/api_friends_xml.tpl
+++ b/view/api_friends_xml.tpl
diff --cc view/api_ratelimit_xml.tpl
index 42439f8b5f,36ec1993df..36ec1993df
mode 100755,100755..100644
--- a/view/api_ratelimit_xml.tpl
+++ b/view/api_ratelimit_xml.tpl
diff --cc view/api_status_xml.tpl
index f6cd9c2c02,f6cd9c2c02..f6cd9c2c02
mode 100755,100755..100644
--- a/view/api_status_xml.tpl
+++ b/view/api_status_xml.tpl
diff --cc view/api_timeline_atom.tpl
index fb4f51f591,fb4f51f591..fb4f51f591
mode 100755,100755..100644
--- a/view/api_timeline_atom.tpl
+++ b/view/api_timeline_atom.tpl
diff --cc view/api_timeline_rss.tpl
index 40239273c1,40239273c1..40239273c1
mode 100755,100755..100644
--- a/view/api_timeline_rss.tpl
+++ b/view/api_timeline_rss.tpl
diff --cc view/api_timeline_xml.tpl
index 17860ca613,17860ca613..17860ca613
mode 100755,100755..100644
--- a/view/api_timeline_xml.tpl
+++ b/view/api_timeline_xml.tpl
diff --cc view/api_user_xml.tpl
index 78cc1f5306,f1e122f3e8..f1e122f3e8
mode 100755,100755..100644
--- a/view/api_user_xml.tpl
+++ b/view/api_user_xml.tpl
diff --cc view/apps.tpl
index 4c7f8c94cc,4c7f8c94cc..4c7f8c94cc
mode 100755,100755..100644
--- a/view/apps.tpl
+++ b/view/apps.tpl
diff --cc view/atom_feed.tpl
index 2feb547ee2,2feb547ee2..2feb547ee2
mode 100755,100755..100644
--- a/view/atom_feed.tpl
+++ b/view/atom_feed.tpl
diff --cc view/atom_feed_dfrn.tpl
index 0bae62b526,0bae62b526..0bae62b526
mode 100755,100755..100644
--- a/view/atom_feed_dfrn.tpl
+++ b/view/atom_feed_dfrn.tpl
diff --cc view/atom_mail.tpl
index bf7c3efc86,bf7c3efc86..bf7c3efc86
mode 100755,100755..100644
--- a/view/atom_mail.tpl
+++ b/view/atom_mail.tpl
diff --cc view/atom_suggest.tpl
index 66c61f9b6e,66c61f9b6e..66c61f9b6e
mode 100755,100755..100644
--- a/view/atom_suggest.tpl
+++ b/view/atom_suggest.tpl
diff --cc view/auto_request.tpl
index 2958397c92,2958397c92..2958397c92
mode 100755,100755..100644
--- a/view/auto_request.tpl
+++ b/view/auto_request.tpl
diff --cc view/ca/cmnt_received_eml.tpl
index ca61ca492e,ca61ca492e..ca61ca492e
mode 100755,100755..100644
--- a/view/ca/cmnt_received_eml.tpl
+++ b/view/ca/cmnt_received_eml.tpl
diff --cc view/ca/follow_notify_eml.tpl
index ab5a4b3711,ab5a4b3711..ab5a4b3711
mode 100755,100755..100644
--- a/view/ca/follow_notify_eml.tpl
+++ b/view/ca/follow_notify_eml.tpl
diff --cc view/ca/friend_complete_eml.tpl
index 539d9ff3df,539d9ff3df..539d9ff3df
mode 100755,100755..100644
--- a/view/ca/friend_complete_eml.tpl
+++ b/view/ca/friend_complete_eml.tpl
diff --cc view/ca/htconfig.tpl
index 28446f3df5,28446f3df5..28446f3df5
mode 100755,100755..100644
--- a/view/ca/htconfig.tpl
+++ b/view/ca/htconfig.tpl
diff --cc view/ca/intro_complete_eml.tpl
index 70507d71da,70507d71da..70507d71da
mode 100755,100755..100644
--- a/view/ca/intro_complete_eml.tpl
+++ b/view/ca/intro_complete_eml.tpl
diff --cc view/ca/lostpass_eml.tpl
index eccf2050a5,eccf2050a5..eccf2050a5
mode 100755,100755..100644
--- a/view/ca/lostpass_eml.tpl
+++ b/view/ca/lostpass_eml.tpl
diff --cc view/ca/mail_received_html_body_eml.tpl
index 64eee0bf15,64eee0bf15..64eee0bf15
mode 100755,100755..100644
--- a/view/ca/mail_received_html_body_eml.tpl
+++ b/view/ca/mail_received_html_body_eml.tpl
diff --cc view/ca/mail_received_text_body_eml.tpl
index b343c4e6d2,b343c4e6d2..b343c4e6d2
mode 100755,100755..100644
--- a/view/ca/mail_received_text_body_eml.tpl
+++ b/view/ca/mail_received_text_body_eml.tpl
diff --cc view/ca/messages.po
index 8463ceb123,8463ceb123..8463ceb123
mode 100755,100755..100644
--- a/view/ca/messages.po
+++ b/view/ca/messages.po
diff --cc view/ca/passchanged_eml.tpl
index 22e54b8c08,22e54b8c08..22e54b8c08
mode 100755,100755..100644
--- a/view/ca/passchanged_eml.tpl
+++ b/view/ca/passchanged_eml.tpl
diff --cc view/ca/register_open_eml.tpl
index 0170c98e39,0170c98e39..0170c98e39
mode 100755,100755..100644
--- a/view/ca/register_open_eml.tpl
+++ b/view/ca/register_open_eml.tpl
diff --cc view/ca/register_verify_eml.tpl
index 3dd966e0a0,3dd966e0a0..3dd966e0a0
mode 100755,100755..100644
--- a/view/ca/register_verify_eml.tpl
+++ b/view/ca/register_verify_eml.tpl
diff --cc view/ca/request_notify_eml.tpl
index 276624aaeb,276624aaeb..276624aaeb
mode 100755,100755..100644
--- a/view/ca/request_notify_eml.tpl
+++ b/view/ca/request_notify_eml.tpl
diff --cc view/ca/strings.php
index e5aed8be6a,e5aed8be6a..e5aed8be6a
mode 100755,100755..100644
--- a/view/ca/strings.php
+++ b/view/ca/strings.php
diff --cc view/ca/wall_received_eml.tpl
index 0b5c150fd4,0b5c150fd4..0b5c150fd4
mode 100755,100755..100644
--- a/view/ca/wall_received_eml.tpl
+++ b/view/ca/wall_received_eml.tpl
diff --cc view/categories_widget.tpl
index 0000000000,061821beb5..061821beb5
mode 000000,100755..100644
--- a/view/categories_widget.tpl
+++ b/view/categories_widget.tpl
diff --cc view/comment_item.tpl
index cde4ca3ca8,a1d4e1043a..a1d4e1043a
mode 100755,100755..100644
--- a/view/comment_item.tpl
+++ b/view/comment_item.tpl
diff --cc view/common_friends.tpl
index 1f610d8c4f,1f610d8c4f..1f610d8c4f
mode 100755,100755..100644
--- a/view/common_friends.tpl
+++ b/view/common_friends.tpl
diff --cc view/common_tabs.tpl
index 146ad29fa0,146ad29fa0..146ad29fa0
mode 100755,100755..100644
--- a/view/common_tabs.tpl
+++ b/view/common_tabs.tpl
diff --cc view/contact_head.tpl
index c7de390af2,a76293a687..a76293a687
mode 100755,100755..100644
--- a/view/contact_head.tpl
+++ b/view/contact_head.tpl
diff --cc view/contact_template.tpl
index b826acc65d,48930b48ab..48930b48ab
mode 100755,100755..100644
--- a/view/contact_template.tpl
+++ b/view/contact_template.tpl
diff --cc view/contacts-template.tpl
index ecb342bf44,ecb342bf44..ecb342bf44
mode 100755,100755..100644
--- a/view/contacts-template.tpl
+++ b/view/contacts-template.tpl
diff --cc view/conversation.tpl
index ff202bbe44,43bb1dd470..43bb1dd470
mode 100755,100755..100644
--- a/view/conversation.tpl
+++ b/view/conversation.tpl
diff --cc view/crepair.tpl
index a3e532b615,a3e532b615..a3e532b615
mode 100755,100755..100644
--- a/view/crepair.tpl
+++ b/view/crepair.tpl
diff --cc view/cropbody.tpl
index b484d15bf7,b484d15bf7..b484d15bf7
mode 100755,100755..100644
--- a/view/cropbody.tpl
+++ b/view/cropbody.tpl
diff --cc view/crophead.tpl
index 48f3754265,48f3754265..48f3754265
mode 100755,100755..100644
--- a/view/crophead.tpl
+++ b/view/crophead.tpl
diff --cc view/cs/cmnt_received_eml.tpl
index ff44923222,ff44923222..ff44923222
mode 100755,100755..100644
--- a/view/cs/cmnt_received_eml.tpl
+++ b/view/cs/cmnt_received_eml.tpl
diff --cc view/cs/cmnt_received_html_body_eml.tpl
index 6b63187436,6b63187436..6b63187436
mode 100755,100755..100644
--- a/view/cs/cmnt_received_html_body_eml.tpl
+++ b/view/cs/cmnt_received_html_body_eml.tpl
diff --cc view/cs/cmnt_received_text_body_eml.tpl
index ff44923222,ff44923222..ff44923222
mode 100755,100755..100644
--- a/view/cs/cmnt_received_text_body_eml.tpl
+++ b/view/cs/cmnt_received_text_body_eml.tpl
diff --cc view/cs/follow_notify_eml.tpl
index 440ba9ca45,440ba9ca45..440ba9ca45
mode 100755,100755..100644
--- a/view/cs/follow_notify_eml.tpl
+++ b/view/cs/follow_notify_eml.tpl
diff --cc view/cs/friend_complete_eml.tpl
index 50bb7e105e,50bb7e105e..50bb7e105e
mode 100755,100755..100644
--- a/view/cs/friend_complete_eml.tpl
+++ b/view/cs/friend_complete_eml.tpl
diff --cc view/cs/htconfig.tpl
index 5d116dd995,5d116dd995..5d116dd995
mode 100755,100755..100644
--- a/view/cs/htconfig.tpl
+++ b/view/cs/htconfig.tpl
diff --cc view/cs/intro_complete_eml.tpl
index 91753f35de,91753f35de..91753f35de
mode 100755,100755..100644
--- a/view/cs/intro_complete_eml.tpl
+++ b/view/cs/intro_complete_eml.tpl
diff --cc view/cs/lostpass_eml.tpl
index 05042ddce0,05042ddce0..05042ddce0
mode 100755,100755..100644
--- a/view/cs/lostpass_eml.tpl
+++ b/view/cs/lostpass_eml.tpl
diff --cc view/cs/mail_received_html_body_eml.tpl
index 427c6c98da,427c6c98da..427c6c98da
mode 100755,100755..100644
--- a/view/cs/mail_received_html_body_eml.tpl
+++ b/view/cs/mail_received_html_body_eml.tpl
diff --cc view/cs/mail_received_text_body_eml.tpl
index c698723773,c698723773..c698723773
mode 100755,100755..100644
--- a/view/cs/mail_received_text_body_eml.tpl
+++ b/view/cs/mail_received_text_body_eml.tpl
diff --cc view/cs/messages.po
index 529504c5cd,529504c5cd..529504c5cd
mode 100755,100755..100644
--- a/view/cs/messages.po
+++ b/view/cs/messages.po
diff --cc view/cs/passchanged_eml.tpl
index 5447d2e804,5447d2e804..5447d2e804
mode 100755,100755..100644
--- a/view/cs/passchanged_eml.tpl
+++ b/view/cs/passchanged_eml.tpl
diff --cc view/cs/register_open_eml.tpl
index f8e42678b4,f8e42678b4..f8e42678b4
mode 100755,100755..100644
--- a/view/cs/register_open_eml.tpl
+++ b/view/cs/register_open_eml.tpl
diff --cc view/cs/register_verify_eml.tpl
index 4b34c6b6dc,4b34c6b6dc..4b34c6b6dc
mode 100755,100755..100644
--- a/view/cs/register_verify_eml.tpl
+++ b/view/cs/register_verify_eml.tpl
diff --cc view/cs/request_notify_eml.tpl
index 74010c79cf,74010c79cf..74010c79cf
mode 100755,100755..100644
--- a/view/cs/request_notify_eml.tpl
+++ b/view/cs/request_notify_eml.tpl
diff --cc view/cs/strings.php
index 0c7d0d7bd8,0c7d0d7bd8..0c7d0d7bd8
mode 100755,100755..100644
--- a/view/cs/strings.php
+++ b/view/cs/strings.php
diff --cc view/cs/wall_received_eml.tpl
index 9fb27ddd8b,9fb27ddd8b..9fb27ddd8b
mode 100755,100755..100644
--- a/view/cs/wall_received_eml.tpl
+++ b/view/cs/wall_received_eml.tpl
diff --cc view/cs/wall_received_html_body_eml.tpl
index 893eec20ca,893eec20ca..893eec20ca
mode 100755,100755..100644
--- a/view/cs/wall_received_html_body_eml.tpl
+++ b/view/cs/wall_received_html_body_eml.tpl
diff --cc view/cs/wall_received_text_body_eml.tpl
index 088f7f9db5,088f7f9db5..088f7f9db5
mode 100755,100755..100644
--- a/view/cs/wall_received_text_body_eml.tpl
+++ b/view/cs/wall_received_text_body_eml.tpl
diff --cc view/custom_tinymce.css
index 7932653b69,7932653b69..7932653b69
mode 100755,100755..100644
--- a/view/custom_tinymce.css
+++ b/view/custom_tinymce.css
diff --cc view/de/cmnt_received_eml.tpl
index 500c93eb48,500c93eb48..500c93eb48
mode 100755,100755..100644
--- a/view/de/cmnt_received_eml.tpl
+++ b/view/de/cmnt_received_eml.tpl
diff --cc view/de/cmnt_received_html_body_eml.tpl
index db7f829bce,db7f829bce..db7f829bce
mode 100755,100755..100644
--- a/view/de/cmnt_received_html_body_eml.tpl
+++ b/view/de/cmnt_received_html_body_eml.tpl
diff --cc view/de/cmnt_received_text_body_eml.tpl
index e00a868af2,e00a868af2..e00a868af2
mode 100755,100755..100644
--- a/view/de/cmnt_received_text_body_eml.tpl
+++ b/view/de/cmnt_received_text_body_eml.tpl
diff --cc view/de/follow_notify_eml.tpl
index d7259a2406,d7259a2406..d7259a2406
mode 100755,100755..100644
--- a/view/de/follow_notify_eml.tpl
+++ b/view/de/follow_notify_eml.tpl
diff --cc view/de/friend_complete_eml.tpl
index 908d0df406,908d0df406..908d0df406
mode 100755,100755..100644
--- a/view/de/friend_complete_eml.tpl
+++ b/view/de/friend_complete_eml.tpl
diff --cc view/de/htconfig.tpl
index 76709ea752,76709ea752..76709ea752
mode 100755,100755..100644
--- a/view/de/htconfig.tpl
+++ b/view/de/htconfig.tpl
diff --cc view/de/intro_complete_eml.tpl
index ff9b8a379f,ff9b8a379f..ff9b8a379f
mode 100755,100755..100644
--- a/view/de/intro_complete_eml.tpl
+++ b/view/de/intro_complete_eml.tpl
diff --cc view/de/lostpass_eml.tpl
index 4c06d0c8d7,4c06d0c8d7..4c06d0c8d7
mode 100755,100755..100644
--- a/view/de/lostpass_eml.tpl
+++ b/view/de/lostpass_eml.tpl
diff --cc view/de/mail_received_html_body_eml.tpl
index 34eea59dac,34eea59dac..34eea59dac
mode 100755,100755..100644
--- a/view/de/mail_received_html_body_eml.tpl
+++ b/view/de/mail_received_html_body_eml.tpl
diff --cc view/de/mail_received_text_body_eml.tpl
index f5c90cfed2,f5c90cfed2..f5c90cfed2
mode 100755,100755..100644
--- a/view/de/mail_received_text_body_eml.tpl
+++ b/view/de/mail_received_text_body_eml.tpl
diff --cc view/de/passchanged_eml.tpl
index d5e8d9048d,d5e8d9048d..d5e8d9048d
mode 100755,100755..100644
--- a/view/de/passchanged_eml.tpl
+++ b/view/de/passchanged_eml.tpl
diff --cc view/de/register_open_eml.tpl
index d27c3c7439,d27c3c7439..d27c3c7439
mode 100755,100755..100644
--- a/view/de/register_open_eml.tpl
+++ b/view/de/register_open_eml.tpl
diff --cc view/de/register_verify_eml.tpl
index 7ae432d612,7ae432d612..7ae432d612
mode 100755,100755..100644
--- a/view/de/register_verify_eml.tpl
+++ b/view/de/register_verify_eml.tpl
diff --cc view/de/request_notify_eml.tpl
index 55fa98e96a,55fa98e96a..55fa98e96a
mode 100755,100755..100644
--- a/view/de/request_notify_eml.tpl
+++ b/view/de/request_notify_eml.tpl
diff --cc view/de/strings.php
index 5438a1c9fc,c9cd91138a..c9cd91138a
mode 100755,100755..100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
diff --cc view/de/wall_received_eml.tpl
index b0ca45b244,b0ca45b244..b0ca45b244
mode 100755,100755..100644
--- a/view/de/wall_received_eml.tpl
+++ b/view/de/wall_received_eml.tpl
diff --cc view/de/wall_received_html_body_eml.tpl
index 407e4fdce7,407e4fdce7..407e4fdce7
mode 100755,100755..100644
--- a/view/de/wall_received_html_body_eml.tpl
+++ b/view/de/wall_received_html_body_eml.tpl
diff --cc view/de/wall_received_text_body_eml.tpl
index c627b0c7e2,c627b0c7e2..c627b0c7e2
mode 100755,100755..100644
--- a/view/de/wall_received_text_body_eml.tpl
+++ b/view/de/wall_received_text_body_eml.tpl
diff --cc view/default.php
index ab1cb0f092,61f5f68635..61f5f68635
mode 100755,100755..100644
--- a/view/default.php
+++ b/view/default.php
diff --cc view/dfrn_req_confirm.tpl
index 58e9233aa7,58e9233aa7..58e9233aa7
mode 100755,100755..100644
--- a/view/dfrn_req_confirm.tpl
+++ b/view/dfrn_req_confirm.tpl
diff --cc view/dfrn_request.tpl
index d8aa8b1818,d8aa8b1818..d8aa8b1818
mode 100755,100755..100644
--- a/view/dfrn_request.tpl
+++ b/view/dfrn_request.tpl
diff --cc view/diasp_dec_hdr.tpl
index e87c618888,e87c618888..e87c618888
mode 100755,100755..100644
--- a/view/diasp_dec_hdr.tpl
+++ b/view/diasp_dec_hdr.tpl
diff --cc view/diaspora_comment.tpl
index 6ef4ab664d,6ef4ab664d..6ef4ab664d
mode 100755,100755..100644
--- a/view/diaspora_comment.tpl
+++ b/view/diaspora_comment.tpl
diff --cc view/diaspora_comment_relay.tpl
index e82de1171e,e82de1171e..e82de1171e
mode 100755,100755..100644
--- a/view/diaspora_comment_relay.tpl
+++ b/view/diaspora_comment_relay.tpl
diff --cc view/diaspora_conversation.tpl
index 12807ba599,12807ba599..12807ba599
mode 100755,100755..100644
--- a/view/diaspora_conversation.tpl
+++ b/view/diaspora_conversation.tpl
diff --cc view/diaspora_like.tpl
index a777aeebed,a777aeebed..a777aeebed
mode 100755,100755..100644
--- a/view/diaspora_like.tpl
+++ b/view/diaspora_like.tpl
diff --cc view/diaspora_like_relay.tpl
index 65559b05bf,65559b05bf..65559b05bf
mode 100755,100755..100644
--- a/view/diaspora_like_relay.tpl
+++ b/view/diaspora_like_relay.tpl
diff --cc view/diaspora_message.tpl
index 667b8d53fa,667b8d53fa..667b8d53fa
mode 100755,100755..100644
--- a/view/diaspora_message.tpl
+++ b/view/diaspora_message.tpl
diff --cc view/diaspora_photo.tpl
index 75ca7f15c7,75ca7f15c7..75ca7f15c7
mode 100755,100755..100644
--- a/view/diaspora_photo.tpl
+++ b/view/diaspora_photo.tpl
diff --cc view/diaspora_post.tpl
index 1ba3ebb1fc,1ba3ebb1fc..1ba3ebb1fc
mode 100755,100755..100644
--- a/view/diaspora_post.tpl
+++ b/view/diaspora_post.tpl
diff --cc view/diaspora_profile.tpl
index e5c3d3cad2,e5c3d3cad2..e5c3d3cad2
mode 100755,100755..100644
--- a/view/diaspora_profile.tpl
+++ b/view/diaspora_profile.tpl
diff --cc view/diaspora_retract.tpl
index 6d5b6e22be,6d5b6e22be..6d5b6e22be
mode 100755,100755..100644
--- a/view/diaspora_retract.tpl
+++ b/view/diaspora_retract.tpl
diff --cc view/diaspora_share.tpl
index c16341b1e1,c16341b1e1..c16341b1e1
mode 100755,100755..100644
--- a/view/diaspora_share.tpl
+++ b/view/diaspora_share.tpl
diff --cc view/diaspora_signed_retract.tpl
index 22120e2870,22120e2870..22120e2870
mode 100755,100755..100644
--- a/view/diaspora_signed_retract.tpl
+++ b/view/diaspora_signed_retract.tpl
diff --cc view/diaspora_vcard.tpl
index de3981a94b,de3981a94b..de3981a94b
mode 100755,100755..100644
--- a/view/diaspora_vcard.tpl
+++ b/view/diaspora_vcard.tpl
diff --cc view/directory_header.tpl
index 1f03540f2c,1f03540f2c..1f03540f2c
mode 100755,100755..100644
--- a/view/directory_header.tpl
+++ b/view/directory_header.tpl
diff --cc view/directory_item.tpl
index b45da4465e,b45da4465e..b45da4465e
mode 100755,100755..100644
--- a/view/directory_item.tpl
+++ b/view/directory_item.tpl
diff --cc view/email_notify_html.tpl
index 43f72f15c4,43f72f15c4..43f72f15c4
mode 100755,100755..100644
--- a/view/email_notify_html.tpl
+++ b/view/email_notify_html.tpl
diff --cc view/email_notify_text.tpl
index 018bb60786,018bb60786..018bb60786
mode 100755,100755..100644
--- a/view/email_notify_text.tpl
+++ b/view/email_notify_text.tpl
diff --cc view/en/follow_notify_eml.tpl
index ae758c9a8f,ae758c9a8f..ae758c9a8f
mode 100755,100755..100644
--- a/view/en/follow_notify_eml.tpl
+++ b/view/en/follow_notify_eml.tpl
diff --cc view/en/friend_complete_eml.tpl
index ab12fcb6b7,ab12fcb6b7..ab12fcb6b7
mode 100755,100755..100644
--- a/view/en/friend_complete_eml.tpl
+++ b/view/en/friend_complete_eml.tpl
diff --cc view/en/htconfig.tpl
index 9e39eeb59c,9e39eeb59c..9e39eeb59c
mode 100755,100755..100644
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
diff --cc view/en/intro_complete_eml.tpl
index a60745ec55,a60745ec55..a60745ec55
mode 100755,100755..100644
--- a/view/en/intro_complete_eml.tpl
+++ b/view/en/intro_complete_eml.tpl
diff --cc view/en/lostpass_eml.tpl
index c350236a43,c350236a43..c350236a43
mode 100755,100755..100644
--- a/view/en/lostpass_eml.tpl
+++ b/view/en/lostpass_eml.tpl
diff --cc view/en/passchanged_eml.tpl
index 9692159e18,9692159e18..9692159e18
mode 100755,100755..100644
--- a/view/en/passchanged_eml.tpl
+++ b/view/en/passchanged_eml.tpl
diff --cc view/en/register_open_eml.tpl
index 221e6ec743,221e6ec743..221e6ec743
mode 100755,100755..100644
--- a/view/en/register_open_eml.tpl
+++ b/view/en/register_open_eml.tpl
diff --cc view/en/register_verify_eml.tpl
index 60c38d8000,60c38d8000..60c38d8000
mode 100755,100755..100644
--- a/view/en/register_verify_eml.tpl
+++ b/view/en/register_verify_eml.tpl
diff --cc view/en/request_notify_eml.tpl
index 9eef7a61eb,9eef7a61eb..9eef7a61eb
mode 100755,100755..100644
--- a/view/en/request_notify_eml.tpl
+++ b/view/en/request_notify_eml.tpl
diff --cc view/es/cmnt_received_eml.tpl
index abf2d95dff,abf2d95dff..abf2d95dff
mode 100755,100755..100644
--- a/view/es/cmnt_received_eml.tpl
+++ b/view/es/cmnt_received_eml.tpl
diff --cc view/es/follow_notify_eml.tpl
index 17bd2c01ce,17bd2c01ce..17bd2c01ce
mode 100755,100755..100644
--- a/view/es/follow_notify_eml.tpl
+++ b/view/es/follow_notify_eml.tpl
diff --cc view/es/friend_complete_eml.tpl
index 0dc867efdc,0dc867efdc..0dc867efdc
mode 100755,100755..100644
--- a/view/es/friend_complete_eml.tpl
+++ b/view/es/friend_complete_eml.tpl
diff --cc view/es/htconfig.tpl
index 6158f6a33d,6158f6a33d..6158f6a33d
mode 100755,100755..100644
--- a/view/es/htconfig.tpl
+++ b/view/es/htconfig.tpl
diff --cc view/es/intro_complete_eml.tpl
index a2964808ce,a2964808ce..a2964808ce
mode 100755,100755..100644
--- a/view/es/intro_complete_eml.tpl
+++ b/view/es/intro_complete_eml.tpl
diff --cc view/es/lostpass_eml.tpl
index 607744bfe7,607744bfe7..607744bfe7
mode 100755,100755..100644
--- a/view/es/lostpass_eml.tpl
+++ b/view/es/lostpass_eml.tpl
diff --cc view/es/mail_received_html_body_eml.tpl
index 5086ec246e,5086ec246e..5086ec246e
mode 100755,100755..100644
--- a/view/es/mail_received_html_body_eml.tpl
+++ b/view/es/mail_received_html_body_eml.tpl
diff --cc view/es/mail_received_text_body_eml.tpl
index 8400b9d014,8400b9d014..8400b9d014
mode 100755,100755..100644
--- a/view/es/mail_received_text_body_eml.tpl
+++ b/view/es/mail_received_text_body_eml.tpl
diff --cc view/es/messages.po
index d3f8557e9c,d3f8557e9c..d3f8557e9c
mode 100755,100755..100644
--- a/view/es/messages.po
+++ b/view/es/messages.po
diff --cc view/es/passchanged_eml.tpl
index 7959846b71,7959846b71..7959846b71
mode 100755,100755..100644
--- a/view/es/passchanged_eml.tpl
+++ b/view/es/passchanged_eml.tpl
diff --cc view/es/register_open_eml.tpl
index 7c7a90b408,7c7a90b408..7c7a90b408
mode 100755,100755..100644
--- a/view/es/register_open_eml.tpl
+++ b/view/es/register_open_eml.tpl
diff --cc view/es/register_verify_eml.tpl
index 9f2cc4d9b7,9f2cc4d9b7..9f2cc4d9b7
mode 100755,100755..100644
--- a/view/es/register_verify_eml.tpl
+++ b/view/es/register_verify_eml.tpl
diff --cc view/es/request_notify_eml.tpl
index 6161c45c13,6161c45c13..6161c45c13
mode 100755,100755..100644
--- a/view/es/request_notify_eml.tpl
+++ b/view/es/request_notify_eml.tpl
diff --cc view/es/strings.php
index ac53a45a9b,ac53a45a9b..ac53a45a9b
mode 100755,100755..100644
--- a/view/es/strings.php
+++ b/view/es/strings.php
diff --cc view/es/wall_received_eml.tpl
index 4cd253c724,4cd253c724..4cd253c724
mode 100755,100755..100644
--- a/view/es/wall_received_eml.tpl
+++ b/view/es/wall_received_eml.tpl
diff --cc view/event_form.tpl
index 7d5f8cf4a3,7d5f8cf4a3..7d5f8cf4a3
mode 100755,100755..100644
--- a/view/event_form.tpl
+++ b/view/event_form.tpl
diff --cc view/event_head.tpl
index 498ac9941c,97201e7229..97201e7229
mode 100755,100755..100644
--- a/view/event_head.tpl
+++ b/view/event_head.tpl
diff --cc view/fake_feed.tpl
index c37071cf4a,c37071cf4a..c37071cf4a
mode 100755,100755..100644
--- a/view/fake_feed.tpl
+++ b/view/fake_feed.tpl
diff --cc view/field.tpl
index 35f5afd39c,35f5afd39c..35f5afd39c
mode 100755,100755..100644
--- a/view/field.tpl
+++ b/view/field.tpl
diff --cc view/field_checkbox.tpl
index 725df4cdf4,725df4cdf4..725df4cdf4
mode 100755,100755..100644
--- a/view/field_checkbox.tpl
+++ b/view/field_checkbox.tpl
diff --cc view/field_custom.tpl
index be15d3f607,be15d3f607..be15d3f607
mode 100755,100755..100644
--- a/view/field_custom.tpl
+++ b/view/field_custom.tpl
diff --cc view/field_input.tpl
index 748d93f3ee,748d93f3ee..748d93f3ee
mode 100755,100755..100644
--- a/view/field_input.tpl
+++ b/view/field_input.tpl
diff --cc view/field_intcheckbox.tpl
index 47a513a55e,47a513a55e..47a513a55e
mode 100755,100755..100644
--- a/view/field_intcheckbox.tpl
+++ b/view/field_intcheckbox.tpl
diff --cc view/field_openid.tpl
index acd93ff62d,acd93ff62d..acd93ff62d
mode 100755,100755..100644
--- a/view/field_openid.tpl
+++ b/view/field_openid.tpl
diff --cc view/field_password.tpl
index e604b7f5da,e604b7f5da..e604b7f5da
mode 100755,100755..100644
--- a/view/field_password.tpl
+++ b/view/field_password.tpl
diff --cc view/field_radio.tpl
index a915e8eb3c,a915e8eb3c..a915e8eb3c
mode 100755,100755..100644
--- a/view/field_radio.tpl
+++ b/view/field_radio.tpl
diff --cc view/field_richtext.tpl
index c124ee000e,c124ee000e..c124ee000e
mode 100755,100755..100644
--- a/view/field_richtext.tpl
+++ b/view/field_richtext.tpl
diff --cc view/field_select.tpl
index d79eb48e0d,d79eb48e0d..d79eb48e0d
mode 100755,100755..100644
--- a/view/field_select.tpl
+++ b/view/field_select.tpl
diff --cc view/field_select_raw.tpl
index 765b285d99,765b285d99..765b285d99
mode 100755,100755..100644
--- a/view/field_select_raw.tpl
+++ b/view/field_select_raw.tpl
diff --cc view/field_textarea.tpl
index 2425cdd3b7,2425cdd3b7..2425cdd3b7
mode 100755,100755..100644
--- a/view/field_textarea.tpl
+++ b/view/field_textarea.tpl
diff --cc view/field_themeselect.tpl
index 0000000000,f9f99492c3..f9f99492c3
mode 000000,100755..100644
--- a/view/field_themeselect.tpl
+++ b/view/field_themeselect.tpl
diff --cc view/field_yesno.tpl
index 5d4a775c29,5d4a775c29..5d4a775c29
mode 100755,100755..100644
--- a/view/field_yesno.tpl
+++ b/view/field_yesno.tpl
diff --cc view/fileas_widget.tpl
index 54fba7435f,54fba7435f..54fba7435f
mode 100755,100755..100644
--- a/view/fileas_widget.tpl
+++ b/view/fileas_widget.tpl
diff --cc view/follow.tpl
index 259e74a931,259e74a931..259e74a931
mode 100755,100755..100644
--- a/view/follow.tpl
+++ b/view/follow.tpl
diff --cc view/follow_slap.tpl
index 0d0889f7db,0d0889f7db..0d0889f7db
mode 100755,100755..100644
--- a/view/follow_slap.tpl
+++ b/view/follow_slap.tpl
diff --cc view/fr/cmnt_received_eml.tpl
index ee98d98de6,ee98d98de6..ee98d98de6
mode 100755,100755..100644
--- a/view/fr/cmnt_received_eml.tpl
+++ b/view/fr/cmnt_received_eml.tpl
diff --cc view/fr/cmnt_received_html_body_eml.tpl
index 1d904c53c6,1d904c53c6..1d904c53c6
mode 100755,100755..100644
--- a/view/fr/cmnt_received_html_body_eml.tpl
+++ b/view/fr/cmnt_received_html_body_eml.tpl
diff --cc view/fr/cmnt_received_text_body_eml.tpl
index d466321383,d466321383..d466321383
mode 100755,100755..100644
--- a/view/fr/cmnt_received_text_body_eml.tpl
+++ b/view/fr/cmnt_received_text_body_eml.tpl
diff --cc view/fr/follow_notify_eml.tpl
index c77a3e427f,c77a3e427f..c77a3e427f
mode 100755,100755..100644
--- a/view/fr/follow_notify_eml.tpl
+++ b/view/fr/follow_notify_eml.tpl
diff --cc view/fr/friend_complete_eml.tpl
index 9b9c551fe0,9b9c551fe0..9b9c551fe0
mode 100755,100755..100644
--- a/view/fr/friend_complete_eml.tpl
+++ b/view/fr/friend_complete_eml.tpl
diff --cc view/fr/htconfig.tpl
index 76709ea752,76709ea752..76709ea752
mode 100755,100755..100644
--- a/view/fr/htconfig.tpl
+++ b/view/fr/htconfig.tpl
diff --cc view/fr/intro_complete_eml.tpl
index b8a7a34574,b8a7a34574..b8a7a34574
mode 100755,100755..100644
--- a/view/fr/intro_complete_eml.tpl
+++ b/view/fr/intro_complete_eml.tpl
diff --cc view/fr/lostpass_eml.tpl
index 168e9a5e22,168e9a5e22..168e9a5e22
mode 100755,100755..100644
--- a/view/fr/lostpass_eml.tpl
+++ b/view/fr/lostpass_eml.tpl
diff --cc view/fr/mail_received_html_body_eml.tpl
index 55e8b8a733,55e8b8a733..55e8b8a733
mode 100755,100755..100644
--- a/view/fr/mail_received_html_body_eml.tpl
+++ b/view/fr/mail_received_html_body_eml.tpl
diff --cc view/fr/mail_received_text_body_eml.tpl
index c877344e0e,c877344e0e..c877344e0e
mode 100755,100755..100644
--- a/view/fr/mail_received_text_body_eml.tpl
+++ b/view/fr/mail_received_text_body_eml.tpl
diff --cc view/fr/messages.po
index 345405760b,345405760b..345405760b
mode 100755,100755..100644
--- a/view/fr/messages.po
+++ b/view/fr/messages.po
diff --cc view/fr/passchanged_eml.tpl
index c1881b13e6,c1881b13e6..c1881b13e6
mode 100755,100755..100644
--- a/view/fr/passchanged_eml.tpl
+++ b/view/fr/passchanged_eml.tpl
diff --cc view/fr/register_open_eml.tpl
index d61a5996df,d61a5996df..d61a5996df
mode 100755,100755..100644
--- a/view/fr/register_open_eml.tpl
+++ b/view/fr/register_open_eml.tpl
diff --cc view/fr/register_verify_eml.tpl
index 54362ce182,54362ce182..54362ce182
mode 100755,100755..100644
--- a/view/fr/register_verify_eml.tpl
+++ b/view/fr/register_verify_eml.tpl
diff --cc view/fr/request_notify_eml.tpl
index afbb2ab7ea,afbb2ab7ea..afbb2ab7ea
mode 100755,100755..100644
--- a/view/fr/request_notify_eml.tpl
+++ b/view/fr/request_notify_eml.tpl
diff --cc view/fr/strings.php
index dda24d3bee,dda24d3bee..dda24d3bee
mode 100755,100755..100644
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
diff --cc view/fr/wall_received_eml.tpl
index adfb91dd81,adfb91dd81..adfb91dd81
mode 100755,100755..100644
--- a/view/fr/wall_received_eml.tpl
+++ b/view/fr/wall_received_eml.tpl
diff --cc view/group_drop.tpl
index 2cbebbb8e5,2cbebbb8e5..2cbebbb8e5
mode 100755,100755..100644
--- a/view/group_drop.tpl
+++ b/view/group_drop.tpl
diff --cc view/group_edit.tpl
index 2fa2b1a552,2fa2b1a552..2fa2b1a552
mode 100755,100755..100644
--- a/view/group_edit.tpl
+++ b/view/group_edit.tpl
diff --cc view/group_side.tpl
index 596a8d13fd,0353b1d2cc..0353b1d2cc
mode 100755,100755..100644
--- a/view/group_side.tpl
+++ b/view/group_side.tpl
diff --cc view/head.tpl
index 722c794414,cd6f5ca972..cd6f5ca972
mode 100755,100755..100644
--- a/view/head.tpl
+++ b/view/head.tpl
diff --cc view/hide_comments.tpl
index 55ee9dd7b1,55ee9dd7b1..55ee9dd7b1
mode 100755,100755..100644
--- a/view/hide_comments.tpl
+++ b/view/hide_comments.tpl
diff --cc view/install.tpl
index b3a5f46fff,b3a5f46fff..b3a5f46fff
mode 100755,100755..100644
--- a/view/install.tpl
+++ b/view/install.tpl
diff --cc view/install_checks.tpl
index a1a75ade60,a1a75ade60..a1a75ade60
mode 100755,100755..100644
--- a/view/install_checks.tpl
+++ b/view/install_checks.tpl
diff --cc view/install_db.tpl
index 1302b5a708,1302b5a708..1302b5a708
mode 100755,100755..100644
--- a/view/install_db.tpl
+++ b/view/install_db.tpl
diff --cc view/install_settings.tpl
index 05b87f904e,05b87f904e..05b87f904e
mode 100755,100755..100644
--- a/view/install_settings.tpl
+++ b/view/install_settings.tpl
diff --cc view/intros.tpl
index e7fd53ca4f,e7fd53ca4f..e7fd53ca4f
mode 100755,100755..100644
--- a/view/intros.tpl
+++ b/view/intros.tpl
diff --cc view/invite.tpl
index 01a45c774f,01a45c774f..01a45c774f
mode 100755,100755..100644
--- a/view/invite.tpl
+++ b/view/invite.tpl
diff --cc view/it/cmnt_received_eml.tpl
index 1991d29ae6,1991d29ae6..1991d29ae6
mode 100755,100755..100644
--- a/view/it/cmnt_received_eml.tpl
+++ b/view/it/cmnt_received_eml.tpl
diff --cc view/it/cmnt_received_html_body_eml.tpl
index 5f2edb84b8,5f2edb84b8..5f2edb84b8
mode 100755,100755..100644
--- a/view/it/cmnt_received_html_body_eml.tpl
+++ b/view/it/cmnt_received_html_body_eml.tpl
diff --cc view/it/cmnt_received_text_body_eml.tpl
index 1991d29ae6,1991d29ae6..1991d29ae6
mode 100755,100755..100644
--- a/view/it/cmnt_received_text_body_eml.tpl
+++ b/view/it/cmnt_received_text_body_eml.tpl
diff --cc view/it/follow_notify_eml.tpl
index 635dbbc291,635dbbc291..635dbbc291
mode 100755,100755..100644
--- a/view/it/follow_notify_eml.tpl
+++ b/view/it/follow_notify_eml.tpl
diff --cc view/it/friend_complete_eml.tpl
index 67ad67b054,67ad67b054..67ad67b054
mode 100755,100755..100644
--- a/view/it/friend_complete_eml.tpl
+++ b/view/it/friend_complete_eml.tpl
diff --cc view/it/htconfig.tpl
index 6158f6a33d,6158f6a33d..6158f6a33d
mode 100755,100755..100644
--- a/view/it/htconfig.tpl
+++ b/view/it/htconfig.tpl
diff --cc view/it/intro_complete_eml.tpl
index 9da946a56d,9da946a56d..9da946a56d
mode 100755,100755..100644
--- a/view/it/intro_complete_eml.tpl
+++ b/view/it/intro_complete_eml.tpl
diff --cc view/it/lostpass_eml.tpl
index 7349717ea0,7349717ea0..7349717ea0
mode 100755,100755..100644
--- a/view/it/lostpass_eml.tpl
+++ b/view/it/lostpass_eml.tpl
diff --cc view/it/mail_received_html_body_eml.tpl
index 8479545505,8479545505..8479545505
mode 100755,100755..100644
--- a/view/it/mail_received_html_body_eml.tpl
+++ b/view/it/mail_received_html_body_eml.tpl
diff --cc view/it/mail_received_text_body_eml.tpl
index c7da9533f1,c7da9533f1..c7da9533f1
mode 100755,100755..100644
--- a/view/it/mail_received_text_body_eml.tpl
+++ b/view/it/mail_received_text_body_eml.tpl
diff --cc view/it/messages.po
index e0375764f9,e0375764f9..e0375764f9
mode 100755,100755..100644
--- a/view/it/messages.po
+++ b/view/it/messages.po
diff --cc view/it/passchanged_eml.tpl
index 290e4db940,290e4db940..290e4db940
mode 100755,100755..100644
--- a/view/it/passchanged_eml.tpl
+++ b/view/it/passchanged_eml.tpl
diff --cc view/it/register_open_eml.tpl
index e5f5af80c6,e5f5af80c6..e5f5af80c6
mode 100755,100755..100644
--- a/view/it/register_open_eml.tpl
+++ b/view/it/register_open_eml.tpl
diff --cc view/it/register_verify_eml.tpl
index f1a34dbf4c,f1a34dbf4c..f1a34dbf4c
mode 100755,100755..100644
--- a/view/it/register_verify_eml.tpl
+++ b/view/it/register_verify_eml.tpl
diff --cc view/it/request_notify_eml.tpl
index 50532cbd4f,50532cbd4f..50532cbd4f
mode 100755,100755..100644
--- a/view/it/request_notify_eml.tpl
+++ b/view/it/request_notify_eml.tpl
diff --cc view/it/strings.php
index 5fd187f7a1,5fd187f7a1..5fd187f7a1
mode 100755,100755..100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
diff --cc view/it/wall_received_eml.tpl
index ba9e25901e,ba9e25901e..ba9e25901e
mode 100755,100755..100644
--- a/view/it/wall_received_eml.tpl
+++ b/view/it/wall_received_eml.tpl
diff --cc view/it/wall_received_html_body_eml.tpl
index cdc05cfa38,cdc05cfa38..cdc05cfa38
mode 100755,100755..100644
--- a/view/it/wall_received_html_body_eml.tpl
+++ b/view/it/wall_received_html_body_eml.tpl
diff --cc view/it/wall_received_text_body_eml.tpl
index 327557ea1e,327557ea1e..327557ea1e
mode 100755,100755..100644
--- a/view/it/wall_received_text_body_eml.tpl
+++ b/view/it/wall_received_text_body_eml.tpl
diff --cc view/jot-header.tpl
index ef760abe0f,67e5eb6810..67e5eb6810
mode 100755,100755..100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
diff --cc view/jot.tpl
index 2f89d43721,91de628ac6..91de628ac6
mode 100755,100755..100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
diff --cc view/jot_geotag.tpl
index b0f71e73bf,b0f71e73bf..b0f71e73bf
mode 100755,100755..100644
--- a/view/jot_geotag.tpl
+++ b/view/jot_geotag.tpl
diff --cc view/like_noshare.tpl
index 2651ea1f89,2651ea1f89..2651ea1f89
mode 100755,100755..100644
--- a/view/like_noshare.tpl
+++ b/view/like_noshare.tpl
diff --cc view/login.tpl
index 4cbbb16240,4cbbb16240..4cbbb16240
mode 100755,100755..100644
--- a/view/login.tpl
+++ b/view/login.tpl
diff --cc view/logout.tpl
index efc971df84,efc971df84..efc971df84
mode 100755,100755..100644
--- a/view/logout.tpl
+++ b/view/logout.tpl
diff --cc view/lostpass.tpl
index cd3644157a,cd3644157a..cd3644157a
mode 100755,100755..100644
--- a/view/lostpass.tpl
+++ b/view/lostpass.tpl
diff --cc view/magicsig.tpl
index 75f9bc475b,75f9bc475b..75f9bc475b
mode 100755,100755..100644
--- a/view/magicsig.tpl
+++ b/view/magicsig.tpl
diff --cc view/mail_conv.tpl
index ed36a7bb20,75a4506f6a..75a4506f6a
mode 100755,100755..100644
--- a/view/mail_conv.tpl
+++ b/view/mail_conv.tpl
diff --cc view/mail_head.tpl
index afb65f5373,afb65f5373..afb65f5373
mode 100755,100755..100644
--- a/view/mail_head.tpl
+++ b/view/mail_head.tpl
diff --cc view/match.tpl
index 5f2fc7a302,5f2fc7a302..5f2fc7a302
mode 100755,100755..100644
--- a/view/match.tpl
+++ b/view/match.tpl
diff --cc view/minimal.php
index a8c6939851,a8c6939851..a8c6939851
mode 100755,100755..100644
--- a/view/minimal.php
+++ b/view/minimal.php
diff --cc view/msg-header.tpl
index 098333893f,2d1ea7a612..2d1ea7a612
mode 100755,100755..100644
--- a/view/msg-header.tpl
+++ b/view/msg-header.tpl
diff --cc view/nav.tpl
index 8c872864c2,4675c3e5c2..4675c3e5c2
mode 100755,100755..100644
--- a/view/nav.tpl
+++ b/view/nav.tpl
diff --cc view/netfriend.tpl
index c2a92ce9ed,c2a92ce9ed..c2a92ce9ed
mode 100755,100755..100644
--- a/view/netfriend.tpl
+++ b/view/netfriend.tpl
diff --cc view/nets.tpl
index cbadf1361b,b0cb8890c5..b0cb8890c5
mode 100755,100755..100644
--- a/view/nets.tpl
+++ b/view/nets.tpl
diff --cc view/notifications.tpl
index 1a13b68b90,1a13b68b90..1a13b68b90
mode 100755,100755..100644
--- a/view/notifications.tpl
+++ b/view/notifications.tpl
diff --cc view/notifications_comments_item.tpl
index 73cc9f9480,73cc9f9480..73cc9f9480
mode 100755,100755..100644
--- a/view/notifications_comments_item.tpl
+++ b/view/notifications_comments_item.tpl
diff --cc view/notifications_dislikes_item.tpl
index 73cc9f9480,73cc9f9480..73cc9f9480
mode 100755,100755..100644
--- a/view/notifications_dislikes_item.tpl
+++ b/view/notifications_dislikes_item.tpl
diff --cc view/notifications_friends_item.tpl
index 73cc9f9480,73cc9f9480..73cc9f9480
mode 100755,100755..100644
--- a/view/notifications_friends_item.tpl
+++ b/view/notifications_friends_item.tpl
diff --cc view/notifications_likes_item.tpl
index 389144d9b1,389144d9b1..389144d9b1
mode 100755,100755..100644
--- a/view/notifications_likes_item.tpl
+++ b/view/notifications_likes_item.tpl
diff --cc view/notifications_network_item.tpl
index bd86548fce,bd86548fce..bd86548fce
mode 100755,100755..100644
--- a/view/notifications_network_item.tpl
+++ b/view/notifications_network_item.tpl
diff --cc view/notifications_posts_item.tpl
index 73cc9f9480,73cc9f9480..73cc9f9480
mode 100755,100755..100644
--- a/view/notifications_posts_item.tpl
+++ b/view/notifications_posts_item.tpl
diff --cc view/notify.tpl
index 73cc9f9480,73cc9f9480..73cc9f9480
mode 100755,100755..100644
--- a/view/notify.tpl
+++ b/view/notify.tpl
diff --cc view/oauth_authorize.tpl
index 31f02ac505,31f02ac505..31f02ac505
mode 100755,100755..100644
--- a/view/oauth_authorize.tpl
+++ b/view/oauth_authorize.tpl
diff --cc view/oauth_authorize_done.tpl
index 51eaea2484,51eaea2484..51eaea2484
mode 100755,100755..100644
--- a/view/oauth_authorize_done.tpl
+++ b/view/oauth_authorize_done.tpl
diff --cc view/oembed_video.tpl
index 5824d8d4e8,5824d8d4e8..5824d8d4e8
mode 100755,100755..100644
--- a/view/oembed_video.tpl
+++ b/view/oembed_video.tpl
diff --cc view/oexchange_xrd.tpl
index c7e6df4988,c7e6df4988..c7e6df4988
mode 100755,100755..100644
--- a/view/oexchange_xrd.tpl
+++ b/view/oexchange_xrd.tpl
diff --cc view/opensearch.tpl
index 374fcaac95,374fcaac95..374fcaac95
mode 100755,100755..100644
--- a/view/opensearch.tpl
+++ b/view/opensearch.tpl
diff --cc view/pagetypes.tpl
index d9f873ea03,d9f873ea03..d9f873ea03
mode 100755,100755..100644
--- a/view/pagetypes.tpl
+++ b/view/pagetypes.tpl
diff --cc view/peoplefind.tpl
index eeae2a29af,eeae2a29af..eeae2a29af
mode 100755,100755..100644
--- a/view/peoplefind.tpl
+++ b/view/peoplefind.tpl
diff --cc view/photo_album.tpl
index 3ab9fe7235,3ab9fe7235..3ab9fe7235
mode 100755,100755..100644
--- a/view/photo_album.tpl
+++ b/view/photo_album.tpl
diff --cc view/photo_drop.tpl
index b4ea62b451,b4ea62b451..b4ea62b451
mode 100755,100755..100644
--- a/view/photo_drop.tpl
+++ b/view/photo_drop.tpl
diff --cc view/photo_edit.tpl
index 9950cc4aca,9950cc4aca..9950cc4aca
mode 100755,100755..100644
--- a/view/photo_edit.tpl
+++ b/view/photo_edit.tpl
diff --cc view/photo_item.tpl
index 22884e848e,22884e848e..22884e848e
mode 100755,100755..100644
--- a/view/photo_item.tpl
+++ b/view/photo_item.tpl
diff --cc view/photo_top.tpl
index 04a054b520,04a054b520..04a054b520
mode 100755,100755..100644
--- a/view/photo_top.tpl
+++ b/view/photo_top.tpl
diff --cc view/photo_view.tpl
index 732caf6900,732caf6900..732caf6900
mode 100755,100755..100644
--- a/view/photo_view.tpl
+++ b/view/photo_view.tpl
diff --cc view/photos_recent.tpl
index b8cb924b79,b8cb924b79..b8cb924b79
mode 100755,100755..100644
--- a/view/photos_recent.tpl
+++ b/view/photos_recent.tpl
diff --cc view/photos_upload.tpl
index 318a924277,318a924277..318a924277
mode 100755,100755..100644
--- a/view/photos_upload.tpl
+++ b/view/photos_upload.tpl
diff --cc view/poco_entry_xml.tpl
index 4d84cee416,4d84cee416..4d84cee416
mode 100755,100755..100644
--- a/view/poco_entry_xml.tpl
+++ b/view/poco_entry_xml.tpl
diff --cc view/poco_xml.tpl
index 9549b695d1,9549b695d1..9549b695d1
mode 100755,100755..100644
--- a/view/poco_xml.tpl
+++ b/view/poco_xml.tpl
diff --cc view/profed_head.tpl
index e1df2c4ad7,a3267d5916..a3267d5916
mode 100755,100755..100644
--- a/view/profed_head.tpl
+++ b/view/profed_head.tpl
diff --cc view/profile-hide-friends.tpl
index 9ecacfbe0f,9ecacfbe0f..9ecacfbe0f
mode 100755,100755..100644
--- a/view/profile-hide-friends.tpl
+++ b/view/profile-hide-friends.tpl
diff --cc view/profile-hide-wall.tpl
index 10185e243d,10185e243d..10185e243d
mode 100755,100755..100644
--- a/view/profile-hide-wall.tpl
+++ b/view/profile-hide-wall.tpl
diff --cc view/profile-in-directory.tpl
index 56b28d37e3,56b28d37e3..56b28d37e3
mode 100755,100755..100644
--- a/view/profile-in-directory.tpl
+++ b/view/profile-in-directory.tpl
diff --cc view/profile-in-netdir.tpl
index 882ad2d17c,882ad2d17c..882ad2d17c
mode 100755,100755..100644
--- a/view/profile-in-netdir.tpl
+++ b/view/profile-in-netdir.tpl
diff --cc view/profile_advanced.tpl
index 470404fc33,470404fc33..470404fc33
mode 100755,100755..100644
--- a/view/profile_advanced.tpl
+++ b/view/profile_advanced.tpl
diff --cc view/profile_edit.tpl
index e5c7162d03,e5c7162d03..e5c7162d03
mode 100755,100755..100644
--- a/view/profile_edit.tpl
+++ b/view/profile_edit.tpl
diff --cc view/profile_edlink.tpl
index ea787b9f53,ea787b9f53..ea787b9f53
mode 100755,100755..100644
--- a/view/profile_edlink.tpl
+++ b/view/profile_edlink.tpl
diff --cc view/profile_entry.tpl
index 7ff6d685b8,7ff6d685b8..7ff6d685b8
mode 100755,100755..100644
--- a/view/profile_entry.tpl
+++ b/view/profile_entry.tpl
diff --cc view/profile_listing_header.tpl
index 61a2737929,61a2737929..61a2737929
mode 100755,100755..100644
--- a/view/profile_listing_header.tpl
+++ b/view/profile_listing_header.tpl
diff --cc view/profile_photo.tpl
index 0b3a1cac17,0b3a1cac17..0b3a1cac17
mode 100755,100755..100644
--- a/view/profile_photo.tpl
+++ b/view/profile_photo.tpl
diff --cc view/profile_publish.tpl
index 8fd0bc913b,8fd0bc913b..8fd0bc913b
mode 100755,100755..100644
--- a/view/profile_publish.tpl
+++ b/view/profile_publish.tpl
diff --cc view/profile_vcard.tpl
index 7cd02f1648,d1e6847951..d1e6847951
mode 100755,100755..100644
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
diff --cc view/prv_message.tpl
index 2ce07ce6fd,2ce07ce6fd..2ce07ce6fd
mode 100755,100755..100644
--- a/view/prv_message.tpl
+++ b/view/prv_message.tpl
diff --cc view/pt-br/messages.po
index c6aca3dd95,c6aca3dd95..c6aca3dd95
mode 100755,100755..100644
--- a/view/pt-br/messages.po
+++ b/view/pt-br/messages.po
diff --cc view/pt-br/strings.php
index 0cf143db49,0cf143db49..0cf143db49
mode 100755,100755..100644
--- a/view/pt-br/strings.php
+++ b/view/pt-br/strings.php
diff --cc view/pwdreset.tpl
index 497b93396d,497b93396d..497b93396d
mode 100755,100755..100644
--- a/view/pwdreset.tpl
+++ b/view/pwdreset.tpl
diff --cc view/register.tpl
index 8ce1d20acb,8ce1d20acb..8ce1d20acb
mode 100755,100755..100644
--- a/view/register.tpl
+++ b/view/register.tpl
diff --cc view/removeme.tpl
index a3ca8d4cfa,a3ca8d4cfa..a3ca8d4cfa
mode 100755,100755..100644
--- a/view/removeme.tpl
+++ b/view/removeme.tpl
diff --cc view/ru/messages.po
index 31a8309355,31a8309355..31a8309355
mode 100755,100755..100644
--- a/view/ru/messages.po
+++ b/view/ru/messages.po
diff --cc view/ru/strings.php
index 4578c37e89,4578c37e89..4578c37e89
mode 100755,100755..100644
--- a/view/ru/strings.php
+++ b/view/ru/strings.php
diff --cc view/saved_searches_aside.tpl
index 9c10a26dec,e6a0d6278d..e6a0d6278d
mode 100755,100755..100644
--- a/view/saved_searches_aside.tpl
+++ b/view/saved_searches_aside.tpl
diff --cc view/search_item.tpl
index 80d6678fb3,bfad1b7b72..bfad1b7b72
mode 100755,100755..100644
--- a/view/search_item.tpl
+++ b/view/search_item.tpl
diff --cc view/settings.tpl
index 25479b5bff,8753474afa..8753474afa
mode 100755,100755..100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
diff --cc view/settings_addons.tpl
index 28fca53620,28fca53620..28fca53620
mode 100755,100755..100644
--- a/view/settings_addons.tpl
+++ b/view/settings_addons.tpl
diff --cc view/settings_connectors.tpl
index 43c0346bba,43c0346bba..43c0346bba
mode 100755,100755..100644
--- a/view/settings_connectors.tpl
+++ b/view/settings_connectors.tpl
diff --cc view/settings_nick_set.tpl
index eb4721d50d,eb4721d50d..eb4721d50d
mode 100755,100755..100644
--- a/view/settings_nick_set.tpl
+++ b/view/settings_nick_set.tpl
diff --cc view/settings_nick_subdir.tpl
index 303c24df71,303c24df71..303c24df71
mode 100755,100755..100644
--- a/view/settings_nick_subdir.tpl
+++ b/view/settings_nick_subdir.tpl
diff --cc view/settings_oauth.tpl
index da1398ab96,da1398ab96..da1398ab96
mode 100755,100755..100644
--- a/view/settings_oauth.tpl
+++ b/view/settings_oauth.tpl
diff --cc view/settings_oauth_edit.tpl
index d293413867,d293413867..d293413867
mode 100755,100755..100644
--- a/view/settings_oauth_edit.tpl
+++ b/view/settings_oauth_edit.tpl
diff --cc view/suggest_friends.tpl
index e97b5e8cce,e97b5e8cce..e97b5e8cce
mode 100755,100755..100644
--- a/view/suggest_friends.tpl
+++ b/view/suggest_friends.tpl
diff --cc view/suggestions.tpl
index 656336496c,656336496c..656336496c
mode 100755,100755..100644
--- a/view/suggestions.tpl
+++ b/view/suggestions.tpl
diff --cc view/sv/cmnt_received_eml.tpl
index d87c7a1d14,d87c7a1d14..d87c7a1d14
mode 100755,100755..100644
--- a/view/sv/cmnt_received_eml.tpl
+++ b/view/sv/cmnt_received_eml.tpl
diff --cc view/sv/follow_notify_eml.tpl
index fee08bdcaf,fee08bdcaf..fee08bdcaf
mode 100755,100755..100644
--- a/view/sv/follow_notify_eml.tpl
+++ b/view/sv/follow_notify_eml.tpl
diff --cc view/sv/friend_complete_eml.tpl
index 2b8b0238e8,2b8b0238e8..2b8b0238e8
mode 100755,100755..100644
--- a/view/sv/friend_complete_eml.tpl
+++ b/view/sv/friend_complete_eml.tpl
diff --cc view/sv/htconfig.tpl
index 76709ea752,76709ea752..76709ea752
mode 100755,100755..100644
--- a/view/sv/htconfig.tpl
+++ b/view/sv/htconfig.tpl
diff --cc view/sv/intro_complete_eml.tpl
index 1f24af25f6,1f24af25f6..1f24af25f6
mode 100755,100755..100644
--- a/view/sv/intro_complete_eml.tpl
+++ b/view/sv/intro_complete_eml.tpl
diff --cc view/sv/lostpass_eml.tpl
index df338fa699,df338fa699..df338fa699
mode 100755,100755..100644
--- a/view/sv/lostpass_eml.tpl
+++ b/view/sv/lostpass_eml.tpl
diff --cc view/sv/mail_received_html_body_eml.tpl
index a9a34c23af,a9a34c23af..a9a34c23af
mode 100755,100755..100644
--- a/view/sv/mail_received_html_body_eml.tpl
+++ b/view/sv/mail_received_html_body_eml.tpl
diff --cc view/sv/mail_received_text_body_eml.tpl
index ac2857b587,ac2857b587..ac2857b587
mode 100755,100755..100644
--- a/view/sv/mail_received_text_body_eml.tpl
+++ b/view/sv/mail_received_text_body_eml.tpl
diff --cc view/sv/passchanged_eml.tpl
index 590462468b,590462468b..590462468b
mode 100755,100755..100644
--- a/view/sv/passchanged_eml.tpl
+++ b/view/sv/passchanged_eml.tpl
diff --cc view/sv/register_open_eml.tpl
index 1471c9b982,1471c9b982..1471c9b982
mode 100755,100755..100644
--- a/view/sv/register_open_eml.tpl
+++ b/view/sv/register_open_eml.tpl
diff --cc view/sv/register_verify_eml.tpl
index aa72bc9aae,aa72bc9aae..aa72bc9aae
mode 100755,100755..100644
--- a/view/sv/register_verify_eml.tpl
+++ b/view/sv/register_verify_eml.tpl
diff --cc view/sv/request_notify_eml.tpl
index 893bce17c8,893bce17c8..893bce17c8
mode 100755,100755..100644
--- a/view/sv/request_notify_eml.tpl
+++ b/view/sv/request_notify_eml.tpl
diff --cc view/sv/strings.php
index eb434df66f,eb434df66f..eb434df66f
mode 100755,100755..100644
--- a/view/sv/strings.php
+++ b/view/sv/strings.php
diff --cc view/sv/wall_received_eml.tpl
index fc450a06df,fc450a06df..fc450a06df
mode 100755,100755..100644
--- a/view/sv/wall_received_eml.tpl
+++ b/view/sv/wall_received_eml.tpl
diff --cc view/tag_slap.tpl
index 6449df4967,6449df4967..6449df4967
mode 100755,100755..100644
--- a/view/tag_slap.tpl
+++ b/view/tag_slap.tpl
diff --cc view/theme/comix-plain/comment_item.tpl
index 9c3facaff0,9c3facaff0..9c3facaff0
mode 100755,100755..100644
--- a/view/theme/comix-plain/comment_item.tpl
+++ b/view/theme/comix-plain/comment_item.tpl
diff --cc view/theme/comix-plain/search_item.tpl
index dba289031c,dba289031c..dba289031c
mode 100755,100755..100644
--- a/view/theme/comix-plain/search_item.tpl
+++ b/view/theme/comix-plain/search_item.tpl
diff --cc view/theme/comix-plain/style.css
index 1a89cae7cf,1a89cae7cf..1a89cae7cf
mode 100755,100755..100644
--- a/view/theme/comix-plain/style.css
+++ b/view/theme/comix-plain/style.css
diff --cc view/theme/comix-plain/theme.php
index be3180dc98,be3180dc98..be3180dc98
mode 100755,100755..100644
--- a/view/theme/comix-plain/theme.php
+++ b/view/theme/comix-plain/theme.php
diff --cc view/theme/comix-plain/wall_item.tpl
index dfcd8ca960,dfcd8ca960..dfcd8ca960
mode 100755,100755..100644
--- a/view/theme/comix-plain/wall_item.tpl
+++ b/view/theme/comix-plain/wall_item.tpl
diff --cc view/theme/comix-plain/wallwall_item.tpl
index abd5967b2a,abd5967b2a..abd5967b2a
mode 100755,100755..100644
--- a/view/theme/comix-plain/wallwall_item.tpl
+++ b/view/theme/comix-plain/wallwall_item.tpl
diff --cc view/theme/comix/comment_item.tpl
index 9c3facaff0,9c3facaff0..9c3facaff0
mode 100755,100755..100644
--- a/view/theme/comix/comment_item.tpl
+++ b/view/theme/comix/comment_item.tpl
diff --cc view/theme/comix/search_item.tpl
index dba289031c,dba289031c..dba289031c
mode 100755,100755..100644
--- a/view/theme/comix/search_item.tpl
+++ b/view/theme/comix/search_item.tpl
diff --cc view/theme/comix/style.css
index 534e79cf49,534e79cf49..534e79cf49
mode 100755,100755..100644
--- a/view/theme/comix/style.css
+++ b/view/theme/comix/style.css
diff --cc view/theme/comix/theme.php
index e2f7f4db38,e2f7f4db38..e2f7f4db38
mode 100755,100755..100644
--- a/view/theme/comix/theme.php
+++ b/view/theme/comix/theme.php
diff --cc view/theme/comix/wall_item.tpl
index dfcd8ca960,dfcd8ca960..dfcd8ca960
mode 100755,100755..100644
--- a/view/theme/comix/wall_item.tpl
+++ b/view/theme/comix/wall_item.tpl
diff --cc view/theme/comix/wallwall_item.tpl
index abd5967b2a,abd5967b2a..abd5967b2a
mode 100755,100755..100644
--- a/view/theme/comix/wallwall_item.tpl
+++ b/view/theme/comix/wallwall_item.tpl
diff --cc view/theme/darkbubble/dbicons.png
index 696ef779cd,696ef779cd..696ef779cd
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/darkbubble/style.css
index 9336dc01b4,9336dc01b4..9336dc01b4
mode 100755,100755..100644
--- a/view/theme/darkbubble/style.css
+++ b/view/theme/darkbubble/style.css
diff --cc view/theme/darkbubble/theme.php
index 053730c21a,053730c21a..053730c21a
mode 100755,100755..100644
--- a/view/theme/darkbubble/theme.php
+++ b/view/theme/darkbubble/theme.php
diff --cc view/theme/darkzero-NS/border.jpg
index 4967412bf4,4967412bf4..4967412bf4
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/darkzero-NS/head.jpg
index 67e8521405,67e8521405..67e8521405
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/darkzero-NS/sectionend.jpg
index 9d5d5c8f3b,9d5d5c8f3b..9d5d5c8f3b
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/darkzero-NS/shiny.png
index 994c0d05d7,994c0d05d7..994c0d05d7
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/darkzero-NS/style.css
index 047381a92e,047381a92e..047381a92e
mode 100755,100755..100644
--- a/view/theme/darkzero-NS/style.css
+++ b/view/theme/darkzero-NS/style.css
diff --cc view/theme/darkzero-NS/theme.php
index 2d3e4fd56e,2d3e4fd56e..2d3e4fd56e
mode 100755,100755..100644
--- a/view/theme/darkzero-NS/theme.php
+++ b/view/theme/darkzero-NS/theme.php
diff --cc view/theme/darkzero/border.jpg
index 4967412bf4,4967412bf4..4967412bf4
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/darkzero/head.jpg
index 67e8521405,67e8521405..67e8521405
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/darkzero/sectionend.jpg
index 9d5d5c8f3b,9d5d5c8f3b..9d5d5c8f3b
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/darkzero/shiny.png
index 994c0d05d7,994c0d05d7..994c0d05d7
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/darkzero/style.css
index 3b395ff2a1,12c7d3c25a..12c7d3c25a
mode 100755,100755..100644
--- a/view/theme/darkzero/style.css
+++ b/view/theme/darkzero/style.css
diff --cc view/theme/darkzero/theme.php
index 8c4d3e9ac3,8c4d3e9ac3..8c4d3e9ac3
mode 100755,100755..100644
--- a/view/theme/darkzero/theme.php
+++ b/view/theme/darkzero/theme.php
diff --cc view/theme/diabook-aerith/communityhome.tpl
index 0000000000,4873cdd14b..4873cdd14b
mode 000000,100755..100644
--- a/view/theme/diabook-aerith/communityhome.tpl
+++ b/view/theme/diabook-aerith/communityhome.tpl
diff --cc view/theme/diabook-aerith/contact_template.tpl
index 0000000000,48930b48ab..48930b48ab
mode 000000,100755..100644
--- a/view/theme/diabook-aerith/contact_template.tpl
+++ b/view/theme/diabook-aerith/contact_template.tpl
diff --cc view/theme/diabook-aerith/directory_item.tpl
index 0000000000,db1936e4b7..db1936e4b7
mode 000000,100755..100644
--- a/view/theme/diabook-aerith/directory_item.tpl
+++ b/view/theme/diabook-aerith/directory_item.tpl
diff --cc view/theme/diabook-aerith/fpostit/fpostit.js
index 0000000000,d183c75736..d183c75736
mode 000000,100755..100644
--- a/view/theme/diabook-aerith/fpostit/fpostit.js
+++ b/view/theme/diabook-aerith/fpostit/fpostit.js
diff --cc view/theme/diabook-aerith/group_side.tpl
index 0000000000,af183d04da..af183d04da
mode 000000,100755..100644
--- a/view/theme/diabook-aerith/group_side.tpl
+++ b/view/theme/diabook-aerith/group_side.tpl
diff --cc view/theme/diabook-aerith/icons/attach.png
index 0000000000,1958041cfa..1958041cfa
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/audio.png
index 0000000000,8d779a4097..8d779a4097
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/camera.png
index 0000000000,a5c7f12364..a5c7f12364
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/close_box.png
index 0000000000,28e2675b8c..28e2675b8c
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/drop.png
index 0000000000,2abb82ef26..2abb82ef26
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/file_as.png
index 0000000000,16713fa530..16713fa530
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/link.png
index 0000000000,0ef666a673..0ef666a673
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/lock.png
index 0000000000,7e34bf2791..7e34bf2791
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/lupe.png
index 0000000000,f8b2283478..f8b2283478
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/messages.png
index 0000000000,e2bf7d24d3..e2bf7d24d3
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/messages2.png
index 0000000000,e2bf7d24d3..e2bf7d24d3
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/next.png
index 0000000000,7b5e25b905..7b5e25b905
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/notifications.png
index 0000000000,2b4fbb8187..2b4fbb8187
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/notify.png
index 0000000000,9765bfd53e..9765bfd53e
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/notify2.png
index 0000000000,9765bfd53e..9765bfd53e
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/pencil.png
index 0000000000,772e49b175..772e49b175
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/photo-menu.jpg
index 0000000000,fde5eb5352..fde5eb5352
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/prev.png
index 0000000000,55c1464ba0..55c1464ba0
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/recycle.png
index 0000000000,c3b8d2bf47..c3b8d2bf47
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/remote.png
index 0000000000,a560cc55e4..a560cc55e4
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/scroll_top.png
index 0000000000,0e7f7ae6a6..0e7f7ae6a6
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/selected.png
index 0000000000,2a30ae2523..2a30ae2523
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/star.png
index 0000000000,0b00cb1893..0b00cb1893
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/starred.png
index 0000000000,2b82dfca31..2b82dfca31
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/tagged.png
index 0000000000,144649ef8f..144649ef8f
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/unlock.png
index 0000000000,a0cda0ae55..a0cda0ae55
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/unstarred.png
index 0000000000,ba3183f5c7..ba3183f5c7
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/video.png
index 0000000000,a03d1d8182..a03d1d8182
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/icons/weblink.png
index 0000000000,216e78344e..216e78344e
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-aerith/jot.tpl
index 0000000000,ee30da7bf7..ee30da7bf7
mode 000000,100755..100644
--- a/view/theme/diabook-aerith/jot.tpl
+++ b/view/theme/diabook-aerith/jot.tpl
diff --cc view/theme/diabook-aerith/mail_conv.tpl
index 0000000000,989f178781..989f178781
mode 000000,100755..100644
--- a/view/theme/diabook-aerith/mail_conv.tpl
+++ b/view/theme/diabook-aerith/mail_conv.tpl
diff --cc view/theme/diabook-aerith/photo_view.tpl
index 0000000000,511fc73acb..511fc73acb
mode 000000,100755..100644
--- a/view/theme/diabook-aerith/photo_view.tpl
+++ b/view/theme/diabook-aerith/photo_view.tpl
diff --cc view/theme/diabook-aerith/rs_common_tabs.tpl
index 0000000000,6a1c5c71bd..6a1c5c71bd
mode 000000,100755..100644
--- a/view/theme/diabook-aerith/rs_common_tabs.tpl
+++ b/view/theme/diabook-aerith/rs_common_tabs.tpl
diff --cc view/theme/diabook-aerith/search_item.tpl
index 0000000000,1238340647..1238340647
mode 000000,100755..100644
--- a/view/theme/diabook-aerith/search_item.tpl
+++ b/view/theme/diabook-aerith/search_item.tpl
diff --cc view/theme/diabook-aerith/theme.php
index 0000000000,e56f0ab742..e56f0ab742
mode 000000,100755..100644
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php
diff --cc view/theme/diabook-blue/communityhome.tpl
index 0000000000,6e126827b5..6e126827b5
mode 000000,100755..100644
--- a/view/theme/diabook-blue/communityhome.tpl
+++ b/view/theme/diabook-blue/communityhome.tpl
diff --cc view/theme/diabook-blue/contact_template.tpl
index 48930b48ab,48930b48ab..48930b48ab
mode 100755,100755..100644
--- a/view/theme/diabook-blue/contact_template.tpl
+++ b/view/theme/diabook-blue/contact_template.tpl
diff --cc view/theme/diabook-blue/directory_item.tpl
index 0000000000,db1936e4b7..db1936e4b7
mode 000000,100755..100644
--- a/view/theme/diabook-blue/directory_item.tpl
+++ b/view/theme/diabook-blue/directory_item.tpl
diff --cc view/theme/diabook-blue/fpostit/fpostit.js
index 0000000000,d183c75736..d183c75736
mode 000000,100755..100644
--- a/view/theme/diabook-blue/fpostit/fpostit.js
+++ b/view/theme/diabook-blue/fpostit/fpostit.js
diff --cc view/theme/diabook-blue/group_side.tpl
index af183d04da,af183d04da..af183d04da
mode 100755,100755..100644
--- a/view/theme/diabook-blue/group_side.tpl
+++ b/view/theme/diabook-blue/group_side.tpl
diff --cc view/theme/diabook-blue/icons/attach.png
index 1958041cfa,1958041cfa..1958041cfa
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/audio.png
index 8d779a4097,8d779a4097..8d779a4097
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/camera.png
index a5c7f12364,a5c7f12364..a5c7f12364
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/close_box.png
index 0000000000,28e2675b8c..28e2675b8c
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/contacts2.png
index 7817279f42,7817279f42..7817279f42
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/drop.png
index 2abb82ef26,2abb82ef26..2abb82ef26
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/file_as.png
index 16713fa530,16713fa530..16713fa530
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/link.png
index 0ef666a673,0ef666a673..0ef666a673
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/lock.png
index 7e34bf2791,7e34bf2791..7e34bf2791
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/lupe.png
index f8b2283478,f8b2283478..f8b2283478
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/messages.png
index f7010c98cc,f7010c98cc..f7010c98cc
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/next.png
index 7b5e25b905,7b5e25b905..7b5e25b905
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/notifications.png
index c23673dbd0,c23673dbd0..c23673dbd0
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/notify.png
index 8a7bdc38f4,8a7bdc38f4..8a7bdc38f4
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/pencil.png
index 772e49b175,772e49b175..772e49b175
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/prev.png
index 55c1464ba0,55c1464ba0..55c1464ba0
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/recycle.png
index c3b8d2bf47,c3b8d2bf47..c3b8d2bf47
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/remote.png
index a560cc55e4,a560cc55e4..a560cc55e4
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/scroll_top.png
index 0e7f7ae6a6,0e7f7ae6a6..0e7f7ae6a6
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/selected.png
index 2a30ae2523,2a30ae2523..2a30ae2523
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/star.png
index 0b00cb1893,0b00cb1893..0b00cb1893
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/starred.png
index 2b82dfca31,2b82dfca31..2b82dfca31
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/tagged.png
index 144649ef8f,144649ef8f..144649ef8f
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/unlock.png
index a0cda0ae55,a0cda0ae55..a0cda0ae55
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/unstarred.png
index ba3183f5c7,ba3183f5c7..ba3183f5c7
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/video.png
index a03d1d8182,a03d1d8182..a03d1d8182
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/icons/weblink.png
index 216e78344e,216e78344e..216e78344e
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook-blue/jot.tpl
index 387eb1f91a,bd43994b54..bd43994b54
mode 100755,100755..100644
--- a/view/theme/diabook-blue/jot.tpl
+++ b/view/theme/diabook-blue/jot.tpl
diff --cc view/theme/diabook-blue/mail_conv.tpl
index 0000000000,989f178781..989f178781
mode 000000,100755..100644
--- a/view/theme/diabook-blue/mail_conv.tpl
+++ b/view/theme/diabook-blue/mail_conv.tpl
diff --cc view/theme/diabook-blue/photo_view.tpl
index 902c2a0ed3,20926656a6..20926656a6
mode 100755,100755..100644
--- a/view/theme/diabook-blue/photo_view.tpl
+++ b/view/theme/diabook-blue/photo_view.tpl
diff --cc view/theme/diabook-blue/rs_common_tabs.tpl
index 0000000000,6a1c5c71bd..6a1c5c71bd
mode 000000,100755..100644
--- a/view/theme/diabook-blue/rs_common_tabs.tpl
+++ b/view/theme/diabook-blue/rs_common_tabs.tpl
diff --cc view/theme/diabook-blue/search_item.tpl
index 0000000000,1238340647..1238340647
mode 000000,100755..100644
--- a/view/theme/diabook-blue/search_item.tpl
+++ b/view/theme/diabook-blue/search_item.tpl
diff --cc view/theme/diabook-blue/theme.php
index f9128ea1fd,2e7aca92a9..2e7aca92a9
mode 100755,100755..100644
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
diff --cc view/theme/diabook-red/communityhome.tpl
index 0000000000,c47bfbda5f..c47bfbda5f
mode 000000,100755..100644
--- a/view/theme/diabook-red/communityhome.tpl
+++ b/view/theme/diabook-red/communityhome.tpl
diff --cc view/theme/diabook-red/contact_template.tpl
index 0000000000,48930b48ab..48930b48ab
mode 000000,100755..100644
--- a/view/theme/diabook-red/contact_template.tpl
+++ b/view/theme/diabook-red/contact_template.tpl
diff --cc view/theme/diabook-red/directory_item.tpl
index 0000000000,db1936e4b7..db1936e4b7
mode 000000,100755..100644
--- a/view/theme/diabook-red/directory_item.tpl
+++ b/view/theme/diabook-red/directory_item.tpl
diff --cc view/theme/diabook-red/fpostit/fpostit.js
index 0000000000,d183c75736..d183c75736
mode 000000,100755..100644
--- a/view/theme/diabook-red/fpostit/fpostit.js
+++ b/view/theme/diabook-red/fpostit/fpostit.js
diff --cc view/theme/diabook-red/group_side.tpl
index 0000000000,af183d04da..af183d04da
mode 000000,100755..100644
--- a/view/theme/diabook-red/group_side.tpl
+++ b/view/theme/diabook-red/group_side.tpl
diff --cc view/theme/diabook-red/icons/attach.png
index 0000000000,1958041cfa..1958041cfa
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/audio.png
index 0000000000,8d779a4097..8d779a4097
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/camera.png
index 0000000000,a5c7f12364..a5c7f12364
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/close_box.png
index 0000000000,28e2675b8c..28e2675b8c
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/contacts.png
index 0000000000,20c990c84b..20c990c84b
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/contacts2.png
index 0000000000,7817279f42..7817279f42
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/drop.png
index 0000000000,2abb82ef26..2abb82ef26
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/file_as.png
index 0000000000,16713fa530..16713fa530
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/link.png
index 0000000000,0ef666a673..0ef666a673
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/lock.png
index 0000000000,7e34bf2791..7e34bf2791
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/lupe.png
index 0000000000,f8b2283478..f8b2283478
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/next.png
index 0000000000,7b5e25b905..7b5e25b905
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/notifications.png
index 0000000000,97e5c311c9..97e5c311c9
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/pencil.png
index 0000000000,772e49b175..772e49b175
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/photo-menu.jpg
index 0000000000,fde5eb5352..fde5eb5352
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/prev.png
index 0000000000,55c1464ba0..55c1464ba0
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/recycle.png
index 0000000000,c3b8d2bf47..c3b8d2bf47
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/remote.png
index 0000000000,a560cc55e4..a560cc55e4
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/scroll_top.png
index 0000000000,0e7f7ae6a6..0e7f7ae6a6
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/selected.png
index 0000000000,2a30ae2523..2a30ae2523
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/star.png
index 0000000000,0b00cb1893..0b00cb1893
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/starred.png
index 0000000000,2b82dfca31..2b82dfca31
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/tagged.png
index 0000000000,144649ef8f..144649ef8f
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/unlock.png
index 0000000000,a0cda0ae55..a0cda0ae55
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/unstarred.png
index 0000000000,ba3183f5c7..ba3183f5c7
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/video.png
index 0000000000,a03d1d8182..a03d1d8182
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/icons/weblink.png
index 0000000000,216e78344e..216e78344e
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook-red/jot.tpl
index 0000000000,bd43994b54..bd43994b54
mode 000000,100755..100644
--- a/view/theme/diabook-red/jot.tpl
+++ b/view/theme/diabook-red/jot.tpl
diff --cc view/theme/diabook-red/mail_conv.tpl
index 0000000000,989f178781..989f178781
mode 000000,100755..100644
--- a/view/theme/diabook-red/mail_conv.tpl
+++ b/view/theme/diabook-red/mail_conv.tpl
diff --cc view/theme/diabook-red/photo_view.tpl
index 0000000000,511fc73acb..511fc73acb
mode 000000,100755..100644
--- a/view/theme/diabook-red/photo_view.tpl
+++ b/view/theme/diabook-red/photo_view.tpl
diff --cc view/theme/diabook-red/rs_common_tabs.tpl
index 0000000000,6a1c5c71bd..6a1c5c71bd
mode 000000,100755..100644
--- a/view/theme/diabook-red/rs_common_tabs.tpl
+++ b/view/theme/diabook-red/rs_common_tabs.tpl
diff --cc view/theme/diabook-red/search_item.tpl
index 0000000000,1238340647..1238340647
mode 000000,100755..100644
--- a/view/theme/diabook-red/search_item.tpl
+++ b/view/theme/diabook-red/search_item.tpl
diff --cc view/theme/diabook-red/theme.php
index 0000000000,0db9818e47..0db9818e47
mode 000000,100755..100644
--- a/view/theme/diabook-red/theme.php
+++ b/view/theme/diabook-red/theme.php
diff --cc view/theme/diabook/communityhome.tpl
index 0000000000,5c2164b50a..5c2164b50a
mode 000000,100755..100644
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
diff --cc view/theme/diabook/contact_template.tpl
index 48930b48ab,48930b48ab..48930b48ab
mode 100755,100755..100644
--- a/view/theme/diabook/contact_template.tpl
+++ b/view/theme/diabook/contact_template.tpl
diff --cc view/theme/diabook/directory_item.tpl
index 0000000000,db1936e4b7..db1936e4b7
mode 000000,100755..100644
--- a/view/theme/diabook/directory_item.tpl
+++ b/view/theme/diabook/directory_item.tpl
diff --cc view/theme/diabook/fpostit/fpostit.js
index 0000000000,d183c75736..d183c75736
mode 000000,100755..100644
--- a/view/theme/diabook/fpostit/fpostit.js
+++ b/view/theme/diabook/fpostit/fpostit.js
diff --cc view/theme/diabook/group_side.tpl
index af183d04da,af183d04da..af183d04da
mode 100755,100755..100644
--- a/view/theme/diabook/group_side.tpl
+++ b/view/theme/diabook/group_side.tpl
diff --cc view/theme/diabook/icons/attach.png
index 1958041cfa,1958041cfa..1958041cfa
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/audio.png
index 8d779a4097,8d779a4097..8d779a4097
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/camera.png
index a5c7f12364,a5c7f12364..a5c7f12364
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/close_box.png
index 0000000000,28e2675b8c..28e2675b8c
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/contacts2.png
index 7817279f42,7817279f42..7817279f42
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/drop.png
index 2abb82ef26,2abb82ef26..2abb82ef26
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/expand.png
index 0000000000,a46e88ea5a..a46e88ea5a
mode 000000,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/file_as.png
index 16713fa530,16713fa530..16713fa530
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/link.png
index 0ef666a673,0ef666a673..0ef666a673
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/lock.png
index 7e34bf2791,7e34bf2791..7e34bf2791
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/lupe.png
index f8b2283478,f8b2283478..f8b2283478
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/messages.png
index 38e11ef888,38e11ef888..38e11ef888
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/next.png
index 7b5e25b905,7b5e25b905..7b5e25b905
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/notifications.png
index 2709977406,2709977406..2709977406
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/notify.png
index 9b852d05b2,9b852d05b2..9b852d05b2
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/pencil.png
index 772e49b175,772e49b175..772e49b175
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/prev.png
index 55c1464ba0,55c1464ba0..55c1464ba0
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/recycle.png
index c3b8d2bf47,c3b8d2bf47..c3b8d2bf47
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/remote.png
index a560cc55e4,a560cc55e4..a560cc55e4
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/scroll_top.png
index 0e7f7ae6a6,0e7f7ae6a6..0e7f7ae6a6
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/selected.png
index 2a30ae2523,2a30ae2523..2a30ae2523
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/star.png
index 0b00cb1893,0b00cb1893..0b00cb1893
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/starred.png
index 2b82dfca31,2b82dfca31..2b82dfca31
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/tagged.png
index 144649ef8f,144649ef8f..144649ef8f
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/unlock.png
index a0cda0ae55,a0cda0ae55..a0cda0ae55
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/unstarred.png
index ba3183f5c7,ba3183f5c7..ba3183f5c7
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/video.png
index a03d1d8182,a03d1d8182..a03d1d8182
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/icons/weblink.png
index 216e78344e,216e78344e..216e78344e
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/diabook/jot.tpl
index 387eb1f91a,bd43994b54..bd43994b54
mode 100755,100755..100644
--- a/view/theme/diabook/jot.tpl
+++ b/view/theme/diabook/jot.tpl
diff --cc view/theme/diabook/mail_conv.tpl
index 0000000000,989f178781..989f178781
mode 000000,100755..100644
--- a/view/theme/diabook/mail_conv.tpl
+++ b/view/theme/diabook/mail_conv.tpl
diff --cc view/theme/diabook/photo_view.tpl
index 511fc73acb,511fc73acb..511fc73acb
mode 100755,100755..100644
--- a/view/theme/diabook/photo_view.tpl
+++ b/view/theme/diabook/photo_view.tpl
diff --cc view/theme/diabook/rs_common_tabs.tpl
index 0000000000,6a1c5c71bd..6a1c5c71bd
mode 000000,100755..100644
--- a/view/theme/diabook/rs_common_tabs.tpl
+++ b/view/theme/diabook/rs_common_tabs.tpl
diff --cc view/theme/diabook/search_item.tpl
index 0000000000,1238340647..1238340647
mode 000000,100755..100644
--- a/view/theme/diabook/search_item.tpl
+++ b/view/theme/diabook/search_item.tpl
diff --cc view/theme/diabook/theme.php
index 39479ce522,50a7c69742..50a7c69742
mode 100755,100755..100644
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
diff --cc view/theme/dispy-dark/fpostit/fpostit.js
index 0000000000,eb593d838e..eb593d838e
mode 000000,100755..100644
--- a/view/theme/dispy-dark/fpostit/fpostit.js
+++ b/view/theme/dispy-dark/fpostit/fpostit.js
diff --cc view/theme/dispy/connect.png
index b76fc13dce,b76fc13dce..b76fc13dce
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/dispy/fpostit/fpostit.js
index 0000000000,d18f5d3451..d18f5d3451
mode 000000,100755..100644
--- a/view/theme/dispy/fpostit/fpostit.js
+++ b/view/theme/dispy/fpostit/fpostit.js
diff --cc view/theme/dispy/login-bg.gif
index cde836c893,cde836c893..cde836c893
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/dispy/menu-user-pin.jpg
index 26449569f4,26449569f4..26449569f4
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/dispy/photo-menu.jpg
index fde5eb5352,fde5eb5352..fde5eb5352
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/dispy/star.png
index a327ba14e4,a327ba14e4..a327ba14e4
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/duepuntozero/border.jpg
index 034a1cb63b,034a1cb63b..034a1cb63b
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/duepuntozero/ff-16.jpg
index 3621f59148,3621f59148..3621f59148
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/duepuntozero/friendika-16.png
index 1a742ecdc1,1a742ecdc1..1a742ecdc1
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/duepuntozero/head.jpg
index 6210b76bef,6210b76bef..6210b76bef
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/duepuntozero/lock.cur
index 892c5e851e,892c5e851e..892c5e851e
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/duepuntozero/login-bg.gif
index cde836c893,cde836c893..cde836c893
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/duepuntozero/photo-menu.jpg
index fde5eb5352,fde5eb5352..fde5eb5352
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/duepuntozero/shiny.png
index 994c0d05d7,994c0d05d7..994c0d05d7
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/duepuntozero/style.css
index b79b00ef41,c30e643ce4..c30e643ce4
mode 100755,100755..100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
diff --cc view/theme/duepuntozero/theme.php
index 701fb13491,701fb13491..701fb13491
mode 100755,100755..100644
--- a/view/theme/duepuntozero/theme.php
+++ b/view/theme/duepuntozero/theme.php
diff --cc view/theme/easterbunny/border.jpg
index 66c7a6fcc7,66c7a6fcc7..66c7a6fcc7
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/easterbunny/head.jpg
index 1acd2ddb82,1acd2ddb82..1acd2ddb82
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/easterbunny/shiny.png
index d3f71ee1db,d3f71ee1db..d3f71ee1db
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/easterbunny/style.css
index ab2e07053f,ab2e07053f..ab2e07053f
mode 100755,100755..100644
--- a/view/theme/easterbunny/style.css
+++ b/view/theme/easterbunny/style.css
diff --cc view/theme/easterbunny/theme.php
index 338f40cbfb,338f40cbfb..338f40cbfb
mode 100755,100755..100644
--- a/view/theme/easterbunny/theme.php
+++ b/view/theme/easterbunny/theme.php
diff --cc view/theme/facepark/border.jpg
index 034a1cb63b,034a1cb63b..034a1cb63b
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/facepark/comment_item.tpl
index 3503c3843e,3503c3843e..3503c3843e
mode 100755,100755..100644
--- a/view/theme/facepark/comment_item.tpl
+++ b/view/theme/facepark/comment_item.tpl
diff --cc view/theme/facepark/contact_template.tpl
index 48930b48ab,48930b48ab..48930b48ab
mode 100755,100755..100644
--- a/view/theme/facepark/contact_template.tpl
+++ b/view/theme/facepark/contact_template.tpl
diff --cc view/theme/facepark/conversation.tpl
index 43bb1dd470,43bb1dd470..43bb1dd470
mode 100755,100755..100644
--- a/view/theme/facepark/conversation.tpl
+++ b/view/theme/facepark/conversation.tpl
diff --cc view/theme/facepark/ff-16.jpg
index 3621f59148,3621f59148..3621f59148
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/facepark/friendika-16.png
index 1a742ecdc1,1a742ecdc1..1a742ecdc1
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/facepark/group_side.tpl
index 0353b1d2cc,0353b1d2cc..0353b1d2cc
mode 100755,100755..100644
--- a/view/theme/facepark/group_side.tpl
+++ b/view/theme/facepark/group_side.tpl
diff --cc view/theme/facepark/head.jpg
index 6210b76bef,6210b76bef..6210b76bef
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/facepark/jot.tpl
index 5fe1f954ee,5fe1f954ee..5fe1f954ee
mode 100755,100755..100644
--- a/view/theme/facepark/jot.tpl
+++ b/view/theme/facepark/jot.tpl
diff --cc view/theme/facepark/lock.cur
index 892c5e851e,892c5e851e..892c5e851e
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/facepark/login-bg.gif
index cde836c893,cde836c893..cde836c893
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/facepark/nav.tpl
index 4675c3e5c2,4675c3e5c2..4675c3e5c2
mode 100755,100755..100644
--- a/view/theme/facepark/nav.tpl
+++ b/view/theme/facepark/nav.tpl
diff --cc view/theme/facepark/nets.tpl
index b0cb8890c5,b0cb8890c5..b0cb8890c5
mode 100755,100755..100644
--- a/view/theme/facepark/nets.tpl
+++ b/view/theme/facepark/nets.tpl
diff --cc view/theme/facepark/photo-menu.jpg
index fde5eb5352,fde5eb5352..fde5eb5352
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/facepark/profile_vcard.tpl
index 154f22363c,154f22363c..154f22363c
mode 100755,100755..100644
--- a/view/theme/facepark/profile_vcard.tpl
+++ b/view/theme/facepark/profile_vcard.tpl
diff --cc view/theme/facepark/saved_searches_aside.tpl
index e6a0d6278d,e6a0d6278d..e6a0d6278d
mode 100755,100755..100644
--- a/view/theme/facepark/saved_searches_aside.tpl
+++ b/view/theme/facepark/saved_searches_aside.tpl
diff --cc view/theme/facepark/search_item.tpl
index bfad1b7b72,bfad1b7b72..bfad1b7b72
mode 100755,100755..100644
--- a/view/theme/facepark/search_item.tpl
+++ b/view/theme/facepark/search_item.tpl
diff --cc view/theme/facepark/shiny.png
index 994c0d05d7,994c0d05d7..994c0d05d7
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/facepark/theme.php
index 701fb13491,701fb13491..701fb13491
mode 100755,100755..100644
--- a/view/theme/facepark/theme.php
+++ b/view/theme/facepark/theme.php
diff --cc view/theme/facepark/wall_item.tpl
index 2c88fc598e,2c88fc598e..2c88fc598e
mode 100755,100755..100644
--- a/view/theme/facepark/wall_item.tpl
+++ b/view/theme/facepark/wall_item.tpl
diff --cc view/theme/facepark/wallwall_item.tpl
index 211906c934,211906c934..211906c934
mode 100755,100755..100644
--- a/view/theme/facepark/wallwall_item.tpl
+++ b/view/theme/facepark/wallwall_item.tpl
diff --cc view/theme/greenzero/border.jpg
index 034a1cb63b,034a1cb63b..034a1cb63b
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/greenzero/greenicons.png
index 2644e42843,2644e42843..2644e42843
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/greenzero/head.jpg
index c697762141,c697762141..c697762141
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/greenzero/shiny.png
index 994c0d05d7,994c0d05d7..994c0d05d7
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/greenzero/style.css
index 355e7829a9,355e7829a9..355e7829a9
mode 100755,100755..100644
--- a/view/theme/greenzero/style.css
+++ b/view/theme/greenzero/style.css
diff --cc view/theme/greenzero/theme.php
index ceec4dd976,ceec4dd976..ceec4dd976
mode 100755,100755..100644
--- a/view/theme/greenzero/theme.php
+++ b/view/theme/greenzero/theme.php
diff --cc view/theme/purplezero/border.jpg
index 66c7a6fcc7,66c7a6fcc7..66c7a6fcc7
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/purplezero/head.jpg
index 1acd2ddb82,1acd2ddb82..1acd2ddb82
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/purplezero/shiny.png
index d3f71ee1db,d3f71ee1db..d3f71ee1db
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/purplezero/style.css
index f0d5b96b94,f0d5b96b94..f0d5b96b94
mode 100755,100755..100644
--- a/view/theme/purplezero/style.css
+++ b/view/theme/purplezero/style.css
diff --cc view/theme/purplezero/theme.php
index ceec4dd976,ceec4dd976..ceec4dd976
mode 100755,100755..100644
--- a/view/theme/purplezero/theme.php
+++ b/view/theme/purplezero/theme.php
diff --cc view/theme/quattro/comment_item.tpl
index 0000000000,cde4ca3ca8..cde4ca3ca8
mode 000000,100755..100644
--- a/view/theme/quattro/comment_item.tpl
+++ b/view/theme/quattro/comment_item.tpl
diff --cc view/theme/quattro/contact_template.tpl
index 0000000000,b826acc65d..b826acc65d
mode 000000,100755..100644
--- a/view/theme/quattro/contact_template.tpl
+++ b/view/theme/quattro/contact_template.tpl
diff --cc view/theme/quattro/conversation.tpl
index 0000000000,ff202bbe44..ff202bbe44
mode 000000,100755..100644
--- a/view/theme/quattro/conversation.tpl
+++ b/view/theme/quattro/conversation.tpl
diff --cc view/theme/quattro/dark/colors.less
index 0000000000,b6d487f92b..b6d487f92b
mode 000000,100755..100644
--- a/view/theme/quattro/dark/colors.less
+++ b/view/theme/quattro/dark/colors.less
diff --cc view/theme/quattro/dark/style.css
index 0000000000,1d951aba84..1d951aba84
mode 000000,100755..100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
diff --cc view/theme/quattro/dark/style.less
index 0000000000,7d81e788a9..7d81e788a9
mode 000000,100755..100644
--- a/view/theme/quattro/dark/style.less
+++ b/view/theme/quattro/dark/style.less
diff --cc view/theme/quattro/experimental
index e69de29bb2,e69de29bb2..e69de29bb2
mode 100755,100755..100644
--- a/view/theme/quattro/experimental
+++ b/view/theme/quattro/experimental
diff --cc view/theme/quattro/green/colors.less
index 0000000000,bc78c3fdad..bc78c3fdad
mode 000000,100755..100644
--- a/view/theme/quattro/green/colors.less
+++ b/view/theme/quattro/green/colors.less
diff --cc view/theme/quattro/green/style.css
index 0000000000,e7cc549d07..e7cc549d07
mode 000000,100755..100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
diff --cc view/theme/quattro/green/style.less
index 0000000000,7d81e788a9..7d81e788a9
mode 000000,100755..100644
--- a/view/theme/quattro/green/style.less
+++ b/view/theme/quattro/green/style.less
diff --cc view/theme/quattro/group_side.tpl
index 0000000000,596a8d13fd..596a8d13fd
mode 000000,100755..100644
--- a/view/theme/quattro/group_side.tpl
+++ b/view/theme/quattro/group_side.tpl
diff --cc view/theme/quattro/icons.less
index e314fba1fd,e314fba1fd..e314fba1fd
mode 100755,100755..100644
--- a/view/theme/quattro/icons.less
+++ b/view/theme/quattro/icons.less
diff --cc view/theme/quattro/jot.tpl
index 0000000000,2f89d43721..2f89d43721
mode 000000,100755..100644
--- a/view/theme/quattro/jot.tpl
+++ b/view/theme/quattro/jot.tpl
diff --cc view/theme/quattro/mail_conv.tpl
index 0000000000,989f178781..989f178781
mode 000000,100755..100644
--- a/view/theme/quattro/mail_conv.tpl
+++ b/view/theme/quattro/mail_conv.tpl
diff --cc view/theme/quattro/msg-header.tpl
index 0000000000,2d1ea7a612..2d1ea7a612
mode 000000,100755..100644
--- a/view/theme/quattro/msg-header.tpl
+++ b/view/theme/quattro/msg-header.tpl
diff --cc view/theme/quattro/nav.tpl
index 0000000000,8c872864c2..8c872864c2
mode 000000,100755..100644
--- a/view/theme/quattro/nav.tpl
+++ b/view/theme/quattro/nav.tpl
diff --cc view/theme/quattro/nets.tpl
index 0000000000,cbadf1361b..cbadf1361b
mode 000000,100755..100644
--- a/view/theme/quattro/nets.tpl
+++ b/view/theme/quattro/nets.tpl
diff --cc view/theme/quattro/profile_vcard.tpl
index 0000000000,7cd02f1648..7cd02f1648
mode 000000,100755..100644
--- a/view/theme/quattro/profile_vcard.tpl
+++ b/view/theme/quattro/profile_vcard.tpl
diff --cc view/theme/quattro/quattro.less
index 27c48f1952,c6352cfe99..c6352cfe99
mode 100755,100755..100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
diff --cc view/theme/quattro/saved_searches_aside.tpl
index 0000000000,9c10a26dec..9c10a26dec
mode 000000,100755..100644
--- a/view/theme/quattro/saved_searches_aside.tpl
+++ b/view/theme/quattro/saved_searches_aside.tpl
diff --cc view/theme/quattro/search_item.tpl
index 0000000000,80d6678fb3..80d6678fb3
mode 000000,100755..100644
--- a/view/theme/quattro/search_item.tpl
+++ b/view/theme/quattro/search_item.tpl
diff --cc view/theme/quattro/wall_item.tpl
index 0000000000,e771db0682..e771db0682
mode 000000,100755..100644
--- a/view/theme/quattro/wall_item.tpl
+++ b/view/theme/quattro/wall_item.tpl
diff --cc view/theme/quattro/wallwall_item.tpl
index 0000000000,693ebaba6f..693ebaba6f
mode 000000,100755..100644
--- a/view/theme/quattro/wallwall_item.tpl
+++ b/view/theme/quattro/wallwall_item.tpl
diff --cc view/theme/slack-NS/style.css
index 82bceeac8f,82bceeac8f..82bceeac8f
mode 100755,100755..100644
--- a/view/theme/slack-NS/style.css
+++ b/view/theme/slack-NS/style.css
diff --cc view/theme/slack-NS/theme.php
index ceec4dd976,ceec4dd976..ceec4dd976
mode 100755,100755..100644
--- a/view/theme/slack-NS/theme.php
+++ b/view/theme/slack-NS/theme.php
diff --cc view/theme/slackr/style.css
index ed3b413fb4,ed3b413fb4..ed3b413fb4
mode 100755,100755..100644
--- a/view/theme/slackr/style.css
+++ b/view/theme/slackr/style.css
diff --cc view/theme/slackr/theme.php
index ceec4dd976,ceec4dd976..ceec4dd976
mode 100755,100755..100644
--- a/view/theme/slackr/theme.php
+++ b/view/theme/slackr/theme.php
diff --cc view/theme/testbubble/calendar.png
index 705a75b8a8,705a75b8a8..705a75b8a8
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/testbubble/comment_item.tpl
index 6d9230dbf8,6d9230dbf8..6d9230dbf8
mode 100755,100755..100644
--- a/view/theme/testbubble/comment_item.tpl
+++ b/view/theme/testbubble/comment_item.tpl
diff --cc view/theme/testbubble/connect.png
index b76fc13dce,b76fc13dce..b76fc13dce
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/testbubble/contact_template.tpl
index 48930b48ab,48930b48ab..48930b48ab
mode 100755,100755..100644
--- a/view/theme/testbubble/contact_template.tpl
+++ b/view/theme/testbubble/contact_template.tpl
diff --cc view/theme/testbubble/conversation.tpl
index 43bb1dd470,43bb1dd470..43bb1dd470
mode 100755,100755..100644
--- a/view/theme/testbubble/conversation.tpl
+++ b/view/theme/testbubble/conversation.tpl
diff --cc view/theme/testbubble/group_drop.tpl
index f088fc06ff,f088fc06ff..f088fc06ff
mode 100755,100755..100644
--- a/view/theme/testbubble/group_drop.tpl
+++ b/view/theme/testbubble/group_drop.tpl
diff --cc view/theme/testbubble/group_edit.tpl
index a8b3f92a07,a8b3f92a07..a8b3f92a07
mode 100755,100755..100644
--- a/view/theme/testbubble/group_edit.tpl
+++ b/view/theme/testbubble/group_edit.tpl
diff --cc view/theme/testbubble/group_side.tpl
index a1fc70a22e,a1fc70a22e..a1fc70a22e
mode 100755,100755..100644
--- a/view/theme/testbubble/group_side.tpl
+++ b/view/theme/testbubble/group_side.tpl
diff --cc view/theme/testbubble/groups.png
index a65a7218c9,a65a7218c9..a65a7218c9
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/testbubble/icons.png
index d21640eaea,d21640eaea..d21640eaea
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/testbubble/icons.svg
index 91bb2ff38d,91bb2ff38d..91bb2ff38d
mode 100755,100755..100644
--- a/view/theme/testbubble/icons.svg
+++ b/view/theme/testbubble/icons.svg
diff --cc view/theme/testbubble/jot-header.tpl
index b44ea78fdd,0d11da2717..0d11da2717
mode 100755,100755..100644
--- a/view/theme/testbubble/jot-header.tpl
+++ b/view/theme/testbubble/jot-header.tpl
diff --cc view/theme/testbubble/jot.tpl
index 45d206d57d,45d206d57d..45d206d57d
mode 100755,100755..100644
--- a/view/theme/testbubble/jot.tpl
+++ b/view/theme/testbubble/jot.tpl
diff --cc view/theme/testbubble/login-bg.gif
index cde836c893,cde836c893..cde836c893
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/testbubble/lrarrow.gif
index fa26769446,fa26769446..fa26769446
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/testbubble/mail_head.tpl
index afb65f5373,afb65f5373..afb65f5373
mode 100755,100755..100644
--- a/view/theme/testbubble/mail_head.tpl
+++ b/view/theme/testbubble/mail_head.tpl
diff --cc view/theme/testbubble/match.tpl
index 244b243ece,244b243ece..244b243ece
mode 100755,100755..100644
--- a/view/theme/testbubble/match.tpl
+++ b/view/theme/testbubble/match.tpl
diff --cc view/theme/testbubble/menu-user-pin.jpg
index 26449569f4,26449569f4..26449569f4
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/testbubble/menu-user-pin.png
index 6becfbb663,6becfbb663..6becfbb663
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/testbubble/nav.tpl
index 43cc7bca00,43cc7bca00..43cc7bca00
mode 100755,100755..100644
--- a/view/theme/testbubble/nav.tpl
+++ b/view/theme/testbubble/nav.tpl
diff --cc view/theme/testbubble/nets.tpl
index b0cb8890c5,b0cb8890c5..b0cb8890c5
mode 100755,100755..100644
--- a/view/theme/testbubble/nets.tpl
+++ b/view/theme/testbubble/nets.tpl
diff --cc view/theme/testbubble/next.png
index 353e2e72a6,353e2e72a6..353e2e72a6
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/testbubble/notifications.png
index f0e24a15b2,f0e24a15b2..f0e24a15b2
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/testbubble/photo-menu.jpg
index b96a96fa15,b96a96fa15..b96a96fa15
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/testbubble/photo_album.tpl
index a0e3f46c49,a0e3f46c49..a0e3f46c49
mode 100755,100755..100644
--- a/view/theme/testbubble/photo_album.tpl
+++ b/view/theme/testbubble/photo_album.tpl
diff --cc view/theme/testbubble/photo_top.tpl
index 48a546a16e,48a546a16e..48a546a16e
mode 100755,100755..100644
--- a/view/theme/testbubble/photo_top.tpl
+++ b/view/theme/testbubble/photo_top.tpl
diff --cc view/theme/testbubble/photo_view.tpl
index 4c754f5978,4c754f5978..4c754f5978
mode 100755,100755..100644
--- a/view/theme/testbubble/photo_view.tpl
+++ b/view/theme/testbubble/photo_view.tpl
diff --cc view/theme/testbubble/photography.png
index 7ec919f2b3,7ec919f2b3..7ec919f2b3
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/testbubble/premium.png
index 1ad601c0f1,1ad601c0f1..1ad601c0f1
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/testbubble/prev.png
index 0ae6022af5,0ae6022af5..0ae6022af5
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/testbubble/profile_entry.tpl
index 5bea298ac5,5bea298ac5..5bea298ac5
mode 100755,100755..100644
--- a/view/theme/testbubble/profile_entry.tpl
+++ b/view/theme/testbubble/profile_entry.tpl
diff --cc view/theme/testbubble/profile_vcard.tpl
index 0ee6919bc9,0ee6919bc9..0ee6919bc9
mode 100755,100755..100644
--- a/view/theme/testbubble/profile_vcard.tpl
+++ b/view/theme/testbubble/profile_vcard.tpl
diff --cc view/theme/testbubble/saved_searches_aside.tpl
index e2aae1e77c,e2aae1e77c..e2aae1e77c
mode 100755,100755..100644
--- a/view/theme/testbubble/saved_searches_aside.tpl
+++ b/view/theme/testbubble/saved_searches_aside.tpl
diff --cc view/theme/testbubble/search.png
index 51c428594b,51c428594b..51c428594b
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/testbubble/search_item.tpl
index a0a4ef393b,a0a4ef393b..a0a4ef393b
mode 100755,100755..100644
--- a/view/theme/testbubble/search_item.tpl
+++ b/view/theme/testbubble/search_item.tpl
diff --cc view/theme/testbubble/star.png
index a327ba14e4,a327ba14e4..a327ba14e4
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/testbubble/style.css
index 1e63c7ef63,1e63c7ef63..1e63c7ef63
mode 100755,100755..100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
diff --cc view/theme/testbubble/user.png
index df899e7e08,df899e7e08..df899e7e08
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/testbubble/wall_item.tpl
index 44491d967c,44491d967c..44491d967c
mode 100755,100755..100644
--- a/view/theme/testbubble/wall_item.tpl
+++ b/view/theme/testbubble/wall_item.tpl
diff --cc view/theme/testbubble/wallwall_item.tpl
index eb7c3ddbaf,eb7c3ddbaf..eb7c3ddbaf
mode 100755,100755..100644
--- a/view/theme/testbubble/wallwall_item.tpl
+++ b/view/theme/testbubble/wallwall_item.tpl
diff --cc view/theme/vier/calendar.png
index 705a75b8a8,705a75b8a8..705a75b8a8
mode 100755,100755..100644
Binary files differ
diff --cc view/theme/vier/contact_template.tpl
index 48930b48ab,48930b48ab..48930b48ab
mode 100755,100755..100644
--- a/view/theme/vier/contact_template.tpl
+++ b/view/theme/vier/contact_template.tpl
diff --cc view/theme/vier/nav.tpl
index 0000000000,8c872864c2..8c872864c2
mode 000000,100755..100644
--- a/view/theme/vier/nav.tpl
+++ b/view/theme/vier/nav.tpl
diff --cc view/theme/vier/search_item.tpl
index fb87d76615,fb87d76615..fb87d76615
mode 100755,100755..100644
--- a/view/theme/vier/search_item.tpl
+++ b/view/theme/vier/search_item.tpl
diff --cc view/viewcontact_template.tpl
index d6f01643ea,d6f01643ea..d6f01643ea
mode 100755,100755..100644
--- a/view/viewcontact_template.tpl
+++ b/view/viewcontact_template.tpl
diff --cc view/wall_item.tpl
index c990775106,9d1dd7d70e..9d1dd7d70e
mode 100755,100755..100644
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
diff --cc view/wallmessage.tpl
index 0000000000,66b2bc3a05..66b2bc3a05
mode 000000,100755..100644
--- a/view/wallmessage.tpl
+++ b/view/wallmessage.tpl
diff --cc view/wallmsg-header.tpl
index 0000000000,cb39225725..cb39225725
mode 000000,100755..100644
--- a/view/wallmsg-header.tpl
+++ b/view/wallmsg-header.tpl
diff --cc view/wallwall_item.tpl
index be942f2619,bad5680c7a..bad5680c7a
mode 100755,100755..100644
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
diff --cc view/xrd_diaspora.tpl
index 25cda533cb,25cda533cb..25cda533cb
mode 100755,100755..100644
--- a/view/xrd_diaspora.tpl
+++ b/view/xrd_diaspora.tpl
diff --cc view/xrd_host.tpl
index dbb20256f9,dbb20256f9..dbb20256f9
mode 100755,100755..100644
--- a/view/xrd_host.tpl
+++ b/view/xrd_host.tpl
diff --cc view/xrd_person.tpl
index a4b921fe10,a4b921fe10..a4b921fe10
mode 100755,100755..100644
--- a/view/xrd_person.tpl
+++ b/view/xrd_person.tpl