Merge branch 'master' of gitorious.org:opensuse/build-service
authorbbrunner <bbrunner@suse.de>
Thu, 26 Aug 2010 12:55:54 +0000 (14:55 +0200)
committerbbrunner <bbrunner@suse.de>
Thu, 26 Aug 2010 12:55:54 +0000 (14:55 +0200)
commit629781d063b19aa9887bc3e60f7b9b73c3db9213
tree6d4d296d4523b906b8c4b5dafb2e151acb5106e0
parent028a93c3ae8c060f8af7a1d5489c01ee84eed039
parent353acc0626b329946dde54384243975f31492bab
Merge branch 'master' of gitorious.org:opensuse/build-service

Conflicts:
src/webui/app/controllers/patchinfo_controller.rb
src/webui/app/views/patchinfo/show.html.erb
src/webui/public/vendor/neutral/images/icons/bug_add.png
src/webui/app/views/patchinfo/edit_patchinfo.html.erb
src/webui/app/views/patchinfo/show.html.erb
src/webui/app/views/project/packages.html.erb