Merge remote-tracking branch 'upstream/master'
authorTony <exocoder@gmail.com>
Thu, 10 Apr 2014 07:07:02 +0000 (08:07 +0100)
committerTony <exocoder@gmail.com>
Thu, 10 Apr 2014 07:07:02 +0000 (08:07 +0100)
commit34984328fd52d85c16393e2883dbc27cc95a9afa
tree724a4921aaa2d82595abae6d5a4aa779318c1e08
parent3cd50739ef28ce02f02bc56dee8ad1636e33e7ae
parent7b366df8226fd692b1d5995d4b434c837924fa83
Merge remote-tracking branch 'upstream/master'

Conflicts:
CMakeLists.txt