OSDN Git Service

pull chara-shee
authorCake <cake_67@users.sourceforge.jp>
Sat, 16 Jan 2010 13:52:51 +0000 (22:52 +0900)
committerCake <cake_67@users.sourceforge.jp>
Sat, 16 Jan 2010 13:52:51 +0000 (22:52 +0900)
1  2 
app/controllers/app_controller.php
app/controllers/users_controller.php

Simple merge
Simple merge