OSDN Git Service

resolved conflicts for merge of d3e75bd7 to gb-ub-photos-denali