resolve merge conflict
authoralkuznet <alexey.kuznetsov@digia.com>
Wed, 8 Dec 2010 15:23:30 +0000 (18:23 +0300)
committeralkuznet <alexey.kuznetsov@digia.com>
Wed, 8 Dec 2010 15:23:30 +0000 (18:23 +0300)
commit1702b79f2cfb1e434d9ecd6f1b79e7b4e7d3ac82
tree989c1618ad5eb023a5f62e447988f0b2093c2215
parentf2c8bb2f06f84ebb3659fe1fbdfc132dcf3857fc
parentd0009647e19b13bced1ab3bee141e2282d979508
resolve merge conflict
hudson/src/main/java/hudson/plugins/meegofft/MeegoFastFeedback.java