Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Fri, 26 Mar 2010 13:51:50 +0000 (14:51 +0100)
committergregor herrmann <gregoa@debian.org>
Fri, 26 Mar 2010 13:51:50 +0000 (14:51 +0100)
commit9414e7256e88bd883345c7af25ead175fd3c1c66
tree0dcf6cdd34c12ea1f536b390ad224c81e049fe15
parent2410d1cba02872da361ad86086176867a19df0b0
parentf1f1d1f768873fe8d5673ba743a6e09fbc32aeb4
Merge branch 'master' into gregoa

Conflicts:
CMakeLists.txt
src/gsm.vala