Merge commit 'refs/merge-requests/13' of git://gitorious.org/qa-tools/ots into integr...
authorTeemu Vainio <tvainio@kapsi.fi>
Wed, 8 Dec 2010 14:43:38 +0000 (16:43 +0200)
committerTeemu Vainio <tvainio@kapsi.fi>
Wed, 8 Dec 2010 14:43:38 +0000 (16:43 +0200)
commit2913cd8408fa4d01a4b8dee04f2e9d50f8557d84
treedd72d3e926ed4992a7d289a8930740f45265aa70
parentf079db69fdba9a68b4ae6fa4cbd60317c70ffafb
parentcdcb04c3afb795df55acc0c53db7b7c5fe4eaff5
Merge commit 'refs/merge-requests/13' of git://gitorious.org/qa-tools/ots into integration

Conflicts:
nose.sh
ots.server/ots/server/xmlrpc/server.py