OSDN Git Service

resolved conflicts for merge of a1939d22 to gb-ub-photos-carlsbad