Update 3.0/themes/browny_wind/views/page.html.php

update view to be compatible with G3.0.4
Update 3.0/themes/browny_wind/views/page.html.php

update view to be compatible with G3.0.4
Conflicts:

	3.0/themes/browny_wind/views/page.html.php
Merge pull request #117 from floridave/master

updated theme to work better with G3.0.4

(manually merged in 91efff1a4595cc3fd66810afad92dab0013c6d60)
Squashed '3.0/themes/pear4gallery3/' changes from f9f9805..f6e42a9

f6e42a9 Support for custom size of photo resizes. Version up to 3.5.2
639cc53 fixes #27, support for image count re-enabled
fe33691 Merge pull request #32 from oneoftwo/patch-3
9790a15 Update views/thumbs.html.php
77408dc Merge pull request #30 from oneoftwo/patch-1
62f7886 Update views/thumbs.html.php
25145c0 b3.4 + threaded thumbLoad
32ddbcc Merge branch 'b3.4'
5db2a89 new attempt for custom logo
1b18764 full url to custom logo stored in var
cd067e4 stupid pear logo..
d64bdbf Attempt to fix custom logo issues, version up
9e8ea7f minor fixes for the FB-comment module support
9af348f version 3.4.3.1
0e6db7c fix for problematic Tag-Cloud module
a7b0a70 Fixes issues with facebook plugins when the user is commenting on a photo and FB links to the album image version 3.4.3
900b94c minor errors
7954cf4 version up
d307b65 attempt to fix #17, image prefetch
015ceca various fixed thanks to e-nando/chris@2243c91c400ff2c18ff40e15b2b355f5429264c5
4971e20 closes #21, no longer have a discontinuous slideshowImages array
ac86dec fixes for facebook-comments, now we are using the full url
efb4fde closes #20, support for the search module in a good way
7a12558 minor fixes to eleminate some debug errors

git-subtree-dir: 3.0/themes/pear4gallery3
git-subtree-split: f6e42a99776267d39c074f8c6b4c3ed606e280f7
Merge commit '25ae7f02cd893127901bd26fc1297d109b781746'
Merge pull request #118 from fredrike/master

Upgrades the theme pear4gallery3 to 3.5.2
Squashed '3.0/themes/pear4gallery3/' changes from f6e42a9..0d77c91

0d77c91 Version up to 3.5.3
24b2bdd better support for g-site-status
f3d705e added description of skimm_lim=0 to theme_options

git-subtree-dir: 3.0/themes/pear4gallery3
git-subtree-split: 0d77c91bab4e8cc231cab576763d0c1c5427d084
Merge commit '6f6a980336c3f1fb8120da0ae33f08c08fcdde52'
Squashed '3.0/themes/pear4gallery3/' changes from 0d77c91..af5f903

af5f903 better support for g-action-status Version 3.5.4

git-subtree-dir: 3.0/themes/pear4gallery3
git-subtree-split: af5f90342ee2a55d014d4580ef412a256f7e25e5
Merge commit '96304ae2aaf153d169b9ca4dbaf8f30b135dc6ed'
Squashed '3.0/themes/pear4gallery3/' changes from af5f903..51c6af4

51c6af4 layout fixes

git-subtree-dir: 3.0/themes/pear4gallery3
git-subtree-split: 51c6af48bf333028d770f70b5441a57092565ecc
Merge commit '91df191c28fdf0aeaff1125eab96f4bfb748969e'
Merge pull request #119 from fredrike/master

Upgrades the theme pear4gallery3 to 3.5.4
Removed error with test.com, added pinterest support and the support for only module and block page display.
Fixed pinerest to work and facebook like. THere were mistakes in facebook that it was not using action. In general settings i was not storing the page setting.
Merge remote-tracking branch 'upstream/master'
Fixing the x2po issues in google.
Merge pull request #120 from psychoph/master

Update to social_share module to fix issues
Update 3.0/modules/author/helpers/author_block.php

Update so module will work with dynamic modules.
Merge pull request #121 from floridave/patch-4

Update 3.0/modules/author/helpers/author_block.php