Merge commit 'refs/merge-requests/1' of git://gitorious.org/qa-tools/meego-testing...
authoralkuznet <alexey.kuznetsov@digia.com>
Thu, 25 Nov 2010 12:38:04 +0000 (15:38 +0300)
committeralkuznet <alexey.kuznetsov@digia.com>
Thu, 25 Nov 2010 12:38:04 +0000 (15:38 +0300)
commit0f4e439082f04868a94e5ae6a8f3c7ad4829a545
treef61c8e8da1ddccffab083f822d8d5dc006f2f712
parentb0571e6b7bec86478f432c68207b88d158993888
parent8054dc65477f1266c654287cd463bfacbe4b7bef
Merge commit 'refs/merge-requests/1' of git://gitorious.org/qa-tools/meego-testing-hudson-plugin into integration

Conflicts:
hudson/src/main/resources/hudson/plugins/meegofft/HelloWorldBuilder/config.jelly
hudson/src/main/java/hudson/plugins/meegofft/HelloWorldBuilder.java
hudson/src/main/resources/hudson/plugins/meegofft/HelloWorldBuilder/config.jelly