Peters Git server - pub/Android/ownCloud.git/commit

author	Jorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
	Tue, 28 Oct 2014 15:13:10 +0000 (16:13 +0100)
committer	Jorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
	Tue, 28 Oct 2014 15:13:10 +0000 (16:13 +0100)
commit	d7d4726929b09ad2dddd1e7ed3bb55c70c9b182d
tree	2d06d6be02b47d7df6d6f37bcd99d5a3838cc6c0	tree \| snapshot (tar.gz tar.bz2 zip)
parent	9fbeb05ad9a4602c5bc366be37fef80ba45c9a1d	commit \| diff
parent	e4058fa2c5776085eba5e68d13b97af32bbcd71f	commit \| diff

Merge branch 'gradleWithInternalDependency' of github.com:owncloudChalmers/android into gradleWithInternalDependency

Conflicts:
setup_env.sh