Merge "res_parking: Cleanup find_channel_parking_lot_name() usage."

author zuul <zuul@gerrit.asterisk.org>

Sat, 26 Mar 2016 19:10:21 +0000 (14:10 -0500)

committer Gerrit Code Review <gerrit2@gerrit.digium.api>

Sat, 26 Mar 2016 19:10:22 +0000 (14:10 -0500)
author zuul <zuul@gerrit.asterisk.org>
Sat, 26 Mar 2016 19:10:21 +0000 (14:10 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Sat, 26 Mar 2016 19:10:22 +0000 (14:10 -0500)
diff --cc res/parking/parking_applications.c
Simple merge
diff --cc res/res_parking.c
Simple merge
author	zuul <zuul@gerrit.asterisk.org>
	Sat, 26 Mar 2016 19:10:21 +0000 (14:10 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Sat, 26 Mar 2016 19:10:22 +0000 (14:10 -0500)
		1	2
res/parking/parking_applications.c	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_parking.c	patch \|	diff1 \|	diff2 \|	blob \| history