OSDN Git Service

Merge remote-tracking branch 'upstream/master'
authorvagrant <vagrant@precise32.(none)>
Tue, 25 Jun 2013 09:05:02 +0000 (09:05 +0000)
committervagrant <vagrant@precise32.(none)>
Tue, 25 Jun 2013 09:05:02 +0000 (09:05 +0000)
commit52feefb8e196cae0774292cce274e068356aec21
tree4b7b7b1554785ace9b1e085741cb642bcb066ed4
parentc00917e48fcfb45c686a164fe706a9c17e6797da
parenta01db3d63606e777546894485d93f5f08bcb91c0
Merge remote-tracking branch 'upstream/master'