OSDN Git Service

Merge remote-tracking branch 'origin/TokenAuthentication'
authoreagletmt <eagletmt@gmail.com>
Tue, 4 Sep 2012 05:24:11 +0000 (14:24 +0900)
committereagletmt <eagletmt@gmail.com>
Tue, 4 Sep 2012 05:24:11 +0000 (14:24 +0900)
commitbc3c395c44234c84f33cacd4a92706d09a38885f
tree898dea9e4f2afdd5ce3ff467789ae07506b64b0d
parentc2786e0ca330a19d9e8a049bb336d026798037c9
parentbf940c686e58374a9ed1835ecbef597c33ee66c2
Merge remote-tracking branch 'origin/TokenAuthentication'

Conflicts:
CUTEn/src/jp/ac/titech/sharp4k/cuten/LectureFolderActivity.java
CUTEn/src/jp/ac/titech/sharp4k/cuten/LectureFolderActivity.java