merge 35/2335/1
authorTim Trampedach <tim@timtt.com>
Sat, 13 Oct 2012 23:29:54 +0000 (16:29 -0700)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Fri, 26 Oct 2012 23:34:47 +0000 (16:34 -0700)
commit796e318cc8b0d72bc35a7ab5c3d5f7f650fbe31d
tree445e9c5ce04c73827d556495f3990e1f2dbc9345
parent47259dda1afd3ce0d22f09c58691cefd8a1b51ff
merge
plugins/websocketsink/websocketsinkmanager.cpp