Branch: refs/heads/2.3 Home: https://github.com/openSUSE/open-build-service Commit: 6c1feff160d7a3fd9191a0136578cd9628714e81 https://github.com/openSUSE/open-build-service/commit/6c1feff160d7a3fd9191a0... Author: Adrian Schröter <adrian@suse.de> Date: 2012-09-18 (Tue, 18 Sep 2012) Changed paths: M src/api/app/controllers/request_controller.rb Log Message: ----------- [api] fix merge error