#1919 - change `convert -v` to `convert -version`
Merge pull request #84 from shadlaws/master

#1919 - change `convert -v` to `convert -version`
Automated update of .build_number to 269 for branch master
Last update: dc3fd9d037871a3ac8b28ab859302ee6ceca3844 (1 commits ago)
Tags by name (includes a G2 mapping)
Merge pull request #86 from mikeage/tag_name

Tags by name (includes a G2 mapping)

Fixes #1940.
Fix up some indentation.
Follow-on to 94b26e506c339f50b8d094057bffc1877a79afa9 - make the new legal_file
functions more robust when passed an unknown extension.  Fixes Item_Model_Test.
Update golden files.
#1943 - Make legal_file::change_extension more robust.
Previously would fail with dots in the directory but no extension.  Added unit tests to verify the new change works.
Merge pull request #92 from shadlaws/fix_1943

#1943 - Make legal_file::change_extension more robust.
#1944 - Fix possible warnings in legal_file::get_photo_types_by_extension and legal_file::get_movie_types_by_extension.
Added unit tests for these two functions, too.
#1941, 1948 - Fix possible warnings in movie and graphics helpers, add functions to convert between seconds and hh:mm:ss.dd.
Also add unit tests for new movie helper functions.
#1942 - Make data_rest and file_proxy more consistent - several minor documentation/formatting changes.
No actual functionality changed here.
Change the logic for finding controllers to use glob() but drop anything
that we can find is git-ignore'd.
Automated update of .build_number to 270 for branch master
Last update: 3a3c21dfc42b94a5340634d9c0b19acf83b1fedb (6 commits ago)
Merge pull request #93 from shadlaws/fix_1944

#1944 - Fix possible warnings in legal_file::get_photo_types_by_extension and legal_file::get_movie_types_by_extension.
Automated update of .build_number to 271 for branch master
Last update: 9359e75ca3e54e0a88ef2e5c82592406952d71fa (1 commits ago)
Simplify get_photo_types_by_extension_test and get_movie_types_by_extension_test.
Merge branch 'master' of github.com:gallery/gallery3
Automated update of .build_number to 272 for branch master
Last update: 9359e75ca3e54e0a88ef2e5c82592406952d71fa (3 commits ago)