am 8fd80e92: am 72ce4235: Merge "Fix possible race conditions during channel...
am 8fd80e92: am 72ce4235: Merge "Fix possible race conditions during channel unregistration." into gingerbread
Merge commit '8fd80e92'
* commit '8fd80e92':
Fix possible race conditions during channel unregistration.