OSDN Git Service

Merge remote-tracking branch 'upstream/master'
authorStefan Bachmann <st.lebach@gmail.com>
Sat, 29 Dec 2012 16:56:36 +0000 (08:56 -0800)
committerStefan Bachmann <st.lebach@gmail.com>
Sat, 29 Dec 2012 16:56:36 +0000 (08:56 -0800)
commitb828c821936f3381af20e70b29494549d7130124
tree59569c7814e33880bcb9e21c9b1a6d5eabd82917
parentf8dcb594a3c546254c92e315910995fab435b566
parente2e893a42bf2ccb026a21cc135a2aeb83cfb0b16
Merge remote-tracking branch 'upstream/master'