[sems/el6/master: 2/2] Merge branch 'master' into el6/master

Mon Jan 3 20:46:49 UTC 2011

commit 3c4d9105e0449498efa8859b100a62b27e171dd6
Merge: 13ed782 a33d081
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Mon Jan 3 23:46:30 2011 +0300

    Merge branch 'master' into el6/master

 ...001-Force-to-use-system-wide-GSM-includes.patch |    2 +-
 ...llow-rewrite-of-custom-makefiles-by-CMake.patch |    2 +-
 ...Set-CFG_PREFIX-to-empty-string-by-default.patch |    2 +-
 ...ql-in-conference-and-early_announce-modul.patch |    2 +-
 ...aid_sip-plugin-to-default-exclude-list-du.patch |    2 +-
 sems-0006-last-minute-fix-proper-version.patch     |    2 +-
 ...gateway-module-s-version-passing-in-CMake.patch |    2 +-
 sems-0008-Install-email-template.patch             |    2 +-
 sems-0009-Don-t-start-py_sems-by-default.patch     |    2 +-
 sems-0010-Move-CMake-defines.patch                 |   66 ++++++++++++++++++++
 sems.spec                                          |    8 ++-
 11 files changed, 82 insertions(+), 10 deletions(-)
---