Rename uploadify SWF wrappers to end in .swf.php for consistency.
Merge branch 'master' of github.com:gallery/gallery3
Automated update of .build_number to 419 for branch master
Last update: d81ed1145dfa57d17c2bb5e7505e2f2af62c823e (3 commits ago)
[ci skip]
Drop PHP 5.5 - it's segfaulting on Travis and it's not released yet anyway.
Merge branch 'master' of github.com:gallery/gallery3
Automated update of .build_number to 420 for branch master
Last update: d81ed1145dfa57d17c2bb5e7505e2f2af62c823e (5 commits ago)
[ci skip]
#2074 - Mirror some additional file_proxy checks in data_rest.
Merge pull request #396 from shadlaws/fix_2074_master

#2074 - Mirror some additional file_proxy checks in data_rest.
Automated update of .build_number to 421 for branch master
Last update: 53d3fa81252f1c033cb3c462b1714865088139cb (1 commits ago)
[ci skip]
add the image size (in pixels) to the info module

adds a new variable "show_size", so had to increment the version number
to 3
fix whitespace
fix upgrade function

allow for sequential upgrades
internationalize image size display

as per comment
https://github.com/gallery/gallery3/pull/394/files#r4643737
change "size" to "dimensions" and display unit "px"
Automated update of .build_number to 422 for branch master
Last update: 47803a2d46df8f567639ba7f6d2afb63655afc19 (5 commits ago)
[ci skip]
add the image size (in pixels) to the info module

adds a new variable "show_size", so had to increment the version number
to 3

Conflicts:
	modules/info/classes/Info/Hook/InfoInstaller.php
fix whitespace

Conflicts:
	modules/info/classes/Info/Hook/InfoInstaller.php
fix upgrade function

allow for sequential upgrades

Conflicts:
	modules/info/classes/Info/Hook/InfoInstaller.php
internationalize image size display

as per comment
https://github.com/gallery/gallery3/pull/394/files#r4643737
change "size" to "dimensions" and display unit "px"

Conflicts:
	modules/info/classes/Info/Hook/InfoInstaller.php