Merge remote-tracking branch 'origin/master' master
authorKim Nguyễn <kn@lri.fr>
Mon, 18 Feb 2013 10:06:09 +0000 (11:06 +0100)
committerKim Nguyễn <kn@lri.fr>
Mon, 18 Feb 2013 10:06:09 +0000 (11:06 +0100)
* origin/master:
  Add a sample file.


Trivial merge