Restore bad merge on CHANGES
authorMatthew Jordan <mjordan@digium.com>
Mon, 17 Jun 2013 14:31:51 +0000 (14:31 +0000)
committerMatthew Jordan <mjordan@digium.com>
Mon, 17 Jun 2013 14:31:51 +0000 (14:31 +0000)
commit0afb1949c907db4d1d212f962435d65d080ec6df
tree10b234e165b21183eed78119f5cb0ad1d3172104
parent2e541ec265f77d23e2aaf92a171f30b16d630e1e
Restore bad merge on CHANGES

The patch for CDRs moved around a lot of content in CHANGES to try and
organize the areas that were affected. This missed some changes that went
in with a merge and removed some updates - this patch adds them back in.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@392004 65c4cc65-6c06-0410-ace0-fbb531ad65f3
CHANGES