AND Private Git Repository - hpcc2014.git/commit

author	RCE <cramamonjisoa@bilbo.iut-bm.univ-fcomte.fr>
	Sun, 27 Apr 2014 17:09:56 +0000 (19:09 +0200)
committer	RCE <cramamonjisoa@bilbo.iut-bm.univ-fcomte.fr>
	Sun, 27 Apr 2014 17:09:56 +0000 (19:09 +0200)
commit	e4b14590c5b948dac64c900d8d83e990a3f79122
tree	61c3c8afa6447c1dc9e5e4ee0f6ab96796f90a36	tree \| snapshot
parent	20552ea673ac9a1d972c077d6926781e47dc5911	commit \| diff
parent	6785b9ef58de0db67c33ca901c7813f3dfdc76e0	commit \| diff

Merge
Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/hpcc2014

Conflicts:
hpcc.tex