Merge commit 'refs/merge-requests/12' of git://gitorious.org/opensuse/build-service...
authorThomas Schmidt <tschmidt@suse.de>
Tue, 19 Jul 2011 15:12:29 +0000 (17:12 +0200)
committerThomas Schmidt <tschmidt@suse.de>
Tue, 19 Jul 2011 15:12:29 +0000 (17:12 +0200)
commitf28daacb0b65af96d1815afa64128d94060ccda4
tree81d5925b248cd8b5c26ccb5f7c40a645f44ac3a7
parent39ffe14f94df819efae48dd4aaf621b3a2839244
parent6fa7611e14fca743ba23690881bd3b20335b96e3
Merge commit 'refs/merge-requests/12' of git://gitorious.org/opensuse/build-service into merge-requests/12

Conflicts:
src/webui/app/mobile_views/main/index.html.erb
src/webui/app/mobile_views/request/show.html.erb