tree 26be5fc587eedd7fe645b4e6c375289f4e107aae
parent 39b408bcbf956acb101d7b2243ef16d1d8cc2364
parent 261eb33f1cb66f8a0fa569fa55402b97af9236b2
author Adrien Béraud <adrienberaud@gmail.com> 1379647931 +1000
committer Adrien Béraud <adrienberaud@gmail.com> 1379647931 +1000

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

Conflicts:
	jni/pjproject-android/configure-android