Add back a comment that I accidentally removed in the last commit.
If profiling is enabled, dump out profiling data instead of proxied
images so that we can see how efficient our proxying is.  Follow-on
for #1959.
Merge branch 'master' of github.com:gallery/gallery3
Automated update of .build_number to 290 for branch master
Last update: 31807a59a5160a816718fbea1b1659398a2110bb (13 commits ago)
Follow-on to b50768142745dc4bfd8a9460c7490ddd00e3b06a - add a default
value for lock_timeout so that folks who get the latest code but don't
run the upgrader don't get burned by a SQL error.
Automated update of .build_number to 291 for branch master
Last update: 4926615cd01ff829324b61ac3e8f61f32f52a36b (1 commits ago)