[asterisk/el6: 3/3] Merge branch 'f15' into el6

[Jeffrey C. Ollie]

commit 6a66a622209edaeeb79f013edb84e6710130733d
Merge: ae8bf43 a010c7f
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Tue Oct 11 10:17:52 2011 -0500

    Merge branch 'f15' into el6

 .gitignore       |    4 ++
 asterisk.service |    4 ++-
 asterisk.spec    |   87 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 sources          |    4 +-
 4 files changed, 94 insertions(+), 5 deletions(-)
---