resolve merge issue.
authorTianyi Liang <tianyi-liang@uiowa.edu>
Sun, 15 Dec 2013 17:51:44 +0000 (11:51 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Sun, 15 Dec 2013 17:51:44 +0000 (11:51 -0600)
commit8d89e06c34a0a22e006a74d48d4cc8843b293f73
tree108a8fc93da2b4369478d70427ef7c9fdeee8137
parentd57e92d7abf39a242db75c28183ffecf2952287d
resolve merge issue.
NEWS