tree f81aaa3ce55089c55b4bcdc8c84b54e43642857a
parent f4cb9709d47175865da529a2c283925bc85b73fb
parent a6caa21addfd6175b4fad6503aa9bf621d5f0552
author Alexandre Savard <alexandre.savard@savoirfairelinux.com> 1346770253 -0400
committer Alexandre Savard <alexandre.savard@savoirfairelinux.com> 1346770253 -0400

Merge branch 'master' of git.savoirfairelinux.com:sflphone-android

Conflicts:
	jni/sflphone