Merge branch 'master' of git+ssh://git.opensuse.org/projects/yast/web-client
authorMartin Schmidkunz <mschmidkunz@suse.de>
Mon, 9 Nov 2009 14:28:39 +0000 (15:28 +0100)
committerMartin Schmidkunz <mschmidkunz@suse.de>
Mon, 9 Nov 2009 14:28:39 +0000 (15:28 +0100)
commit094cd26fe2a55c62d00c448d5234da2844ef489b
treec3c2b651935df884d6fa7f6cd0eded09d8c6e922
parentf917001241aa809efd91e4cfd197b5736a502e5e
parente8603174b3c591af693043bc663012bc8309aa2b
Merge branch 'master' of git+ssh://git.opensuse.org/projects/yast/web-client
plugins/administrator/app/views/administrator/index.html.erb
plugins/services/app/views/services/index.rhtml